Linux: Flush cairo surface at end of CanvasPaintLinux.

skia/ext/canvas_paint_linux.h

 
 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SKIA_EXT_CANVAS_PAINT_LINUX_H_
 #define SKIA_EXT_CANVAS_PAINT_LINUX_H_
 
 #include "base/logging.h"
 #include "skia/ext/platform_canvas.h"
@@ skipping 31 matching lines @@
       T::restoreToCount(1);
 
       // Blit the dirty rect to the window.
       CHECK(window_);
       cairo_t* cr = gdk_cairo_create(window_);
       CHECK(cr);
       if (composite_alpha_)
         cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
       cairo_surface_t* source_surface = cairo_get_target(context_);
       CHECK(source_surface);
+      // Flush cairo's cache of the surface.
+      cairo_surface_mark_dirty(source_surface);
       GdkRectangle bounds = rectangle();
       cairo_set_source_surface(cr, source_surface, bounds.x, bounds.y);
       gdk_cairo_region(cr, region_);
       cairo_fill(cr);
       cairo_destroy(cr);
     }
 
     gdk_region_destroy(region_);
   }
 
@@ skipping 14 matching lines @@
     GdkRectangle bounds;
     gdk_region_get_clipbox(region_, &bounds);
     return bounds;
   }
 
  private:
   void init(bool opaque) {
     GdkRectangle bounds = rectangle();
     if (!T::initialize(bounds.width, bounds.height, opaque, NULL)) {
       // Cause a deliberate crash;
-      *(char*) 0 = 0;
+      CHECK(false);
     }
 
     // Need to translate so that the dirty region appears at the origin of the
     // surface.
     T::translate(-SkIntToScalar(bounds.x), -SkIntToScalar(bounds.y));
 
     context_ = T::getTopPlatformDevice().beginPlatformPaint();
   }
 
   cairo_t* context_;
   GdkWindow* window_;
   GdkRegion* region_;
   // See description above setter.
   bool composite_alpha_;
 
   // Disallow copy and assign.
   CanvasPaintT(const CanvasPaintT&);
   CanvasPaintT& operator=(const CanvasPaintT&);
 };
 
 typedef CanvasPaintT<PlatformCanvas> PlatformCanvasPaint;
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_CANVAS_PAINT_LINUX_H_