From 9f69910808f81047911c54cee906ff5d7c2e9974 Mon Sep 17 00:00:00 2001
From: "thestig@chromium.org"
<thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 24 Sep 2009 21:56:36 +0000
Subject: [PATCH] Make Chromium Linux work over VNC again.
BUG=none
TEST=Run a debug copy of Chromium over VNC, should not hit the DCHECK.
Review URL: http://codereview.chromium.org/218024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27133 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/browser/gtk/cairo_cached_surface.cc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/chrome/browser/gtk/cairo_cached_surface.cc b/chrome/browser/gtk/cairo_cached_surface.cc
index 90e0ae493a0ad..19ec295c55c00 100644
--- a/chrome/browser/gtk/cairo_cached_surface.cc
+++ b/chrome/browser/gtk/cairo_cached_surface.cc
@@ -55,8 +55,12 @@ void CairoCachedSurface::SetSource(cairo_t* cr, int x, int y) {
gdk_pixbuf_get_height(pixbuf_));
DCHECK(surface_);
- DCHECK(cairo_surface_get_type(surface_) == CAIRO_SURFACE_TYPE_XLIB ||
- cairo_surface_get_type(surface_) == CAIRO_SURFACE_TYPE_XCB);
+#if !defined(NDEBUG)
+ int surface_type = cairo_surface_get_type(surface_);
+ DCHECK(surface_type == CAIRO_SURFACE_TYPE_XLIB ||
+ surface_type == CAIRO_SURFACE_TYPE_XCB ||
+ surface_type == CAIRO_SURFACE_TYPE_IMAGE);
+#endif
cairo_t* copy_cr = cairo_create(surface_);
gdk_cairo_set_source_pixbuf(copy_cr, pixbuf_, 0, 0);
--
GitLab