Removal of dependencies on PlatformDevice classes.

ui/gfx/canvas_skia_linux.cc

Index: ui/gfx/canvas_skia_linux.cc
===================================================================
--- ui/gfx/canvas_skia_linux.cc	(revision 85945)
+++ ui/gfx/canvas_skia_linux.cc	(working copy)
@@ -208,7 +208,7 @@
       text_height_(0) {
   DCHECK(!bounds_.IsEmpty());
 
-  cr_ = canvas_->beginPlatformPaint();
+  cr_ = skia::BeginPlatformPaint(canvas_);
   layout_ = pango_cairo_create_layout(cr_);
 
   SetupPangoLayout(layout_, text, font, bounds_.width(), flags_);
@@ -246,8 +246,10 @@
   }
   cairo_restore(cr_);
 
+  skia::EndPlatformPaint(canvas_);
+
   g_object_unref(layout_);
-  // NOTE: beginPlatformPaint returned its surface, we shouldn't destroy it.
+  // NOTE: BeginPlatformPaint returned its surface, we shouldn't destroy it.
 }
 
 void DrawStringContext::Draw(const SkColor& text_color) {
@@ -266,32 +268,33 @@
   text_canvas.FillRectInt(static_cast<SkColor>(0),
       0, 0, bounds_.width() + 2, bounds_.height() + 2);
 
-  cairo_t* text_cr = text_canvas.beginPlatformPaint();
+  {
+    skia::ScopedPlatformPaint scoped_platform_paint(&text_canvas);
+    cairo_t* text_cr = scoped_platform_paint.GetPlatformSurface();
 
-  cairo_move_to(text_cr, 2, 1);
-  pango_cairo_layout_path(text_cr, layout_);
+    cairo_move_to(text_cr, 2, 1);
+    pango_cairo_layout_path(text_cr, layout_);
 
-  cairo_set_source_rgba(text_cr,
-                        SkColorGetR(halo_color) / 255.0,
-                        SkColorGetG(halo_color) / 255.0,
-                        SkColorGetB(halo_color) / 255.0,
-                        SkColorGetA(halo_color) / 255.0);
-  cairo_set_line_width(text_cr, 2.0);
-  cairo_set_line_join(text_cr, CAIRO_LINE_JOIN_ROUND);
-  cairo_stroke_preserve(text_cr);
+    cairo_set_source_rgba(text_cr,
+                          SkColorGetR(halo_color) / 255.0,
+                          SkColorGetG(halo_color) / 255.0,
+                          SkColorGetB(halo_color) / 255.0,
+                          SkColorGetA(halo_color) / 255.0);
+    cairo_set_line_width(text_cr, 2.0);
+    cairo_set_line_join(text_cr, CAIRO_LINE_JOIN_ROUND);
+    cairo_stroke_preserve(text_cr);
 
-  cairo_set_operator(text_cr, CAIRO_OPERATOR_SOURCE);
-  cairo_set_source_rgba(text_cr,
-                        SkColorGetR(text_color) / 255.0,
-                        SkColorGetG(text_color) / 255.0,
-                        SkColorGetB(text_color) / 255.0,
-                        SkColorGetA(text_color) / 255.0);
-  cairo_fill(text_cr);
+    cairo_set_operator(text_cr, CAIRO_OPERATOR_SOURCE);
+    cairo_set_source_rgba(text_cr,
+                          SkColorGetR(text_color) / 255.0,
+                          SkColorGetG(text_color) / 255.0,
+                          SkColorGetB(text_color) / 255.0,
+                          SkColorGetA(text_color) / 255.0);
+    cairo_fill(text_cr);
+  }
 
-  text_canvas.endPlatformPaint();
-
   const SkBitmap& text_bitmap = const_cast<SkBitmap&>(
-      text_canvas.getTopPlatformDevice().accessBitmap(false));
+      text_canvas.getTopDevice().accessBitmap(false));
   canvas_->DrawBitmapInt(text_bitmap, text_x_ - 1, text_y_ - 1);
 }
 
@@ -379,7 +382,8 @@
     return;
   }
 
-  cairo_t* cr = beginPlatformPaint();
+  skia::ScopedPlatformPaint scoped_platform_paint(this);
+  cairo_t* cr = scoped_platform_paint.GetPlatformSurface();

[Jeff Timanus, 2011/05/24 16:50:28]

This path was also missing a paired endPlatformPaint.  My changes will now
introduce one at the end of the scope.

   gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
   cairo_paint(cr);
 }