Removal of dependencies on PlatformDevice classes.

ui/gfx/canvas_skia_linux.cc

 // Copyright (c) 2011 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.
 
 #include "ui/gfx/canvas_skia.h"
 
 #include <cairo/cairo.h>
 #include <gtk/gtk.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
@@ skipping 190 matching lines @@
       font_(font),
       canvas_(canvas),
       cr_(NULL),
       layout_(NULL),
       text_x_(bounds.x()),
       text_y_(bounds.y()),
       text_width_(0),
       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_);
 
   pango_layout_set_height(layout_, bounds_.height() * PANGO_SCALE);
 
   cairo_save(cr_);
 
   cairo_rectangle(cr_, clip.x(), clip.y(), clip.width(), clip.height());
   cairo_clip(cr_);
@@ skipping 17 matching lines @@
     double underline_y =
         static_cast<double>(text_y_) + text_height_ +
         platform_font->underline_position();
     cairo_set_line_width(cr_, platform_font->underline_thickness());
     cairo_move_to(cr_, text_x_, underline_y);
     cairo_line_to(cr_, text_x_ + text_width_, underline_y);
     cairo_stroke(cr_);
   }
   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) {
   cairo_set_source_rgba(cr_,
                         SkColorGetR(text_color) / 255.0,
                         SkColorGetG(text_color) / 255.0,
                         SkColorGetB(text_color) / 255.0,
                         SkColorGetA(text_color) / 255.0);
   cairo_move_to(cr_, text_x_, text_y_);
   pango_cairo_show_layout(cr_, layout_);
 }
 
 void DrawStringContext::DrawWithHalo(const SkColor& text_color,
                                      const SkColor& halo_color) {
   gfx::CanvasSkia text_canvas(bounds_.width() + 2, bounds_.height() + 2, false);
   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);
-
-  text_canvas.endPlatformPaint();
+    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);
+  }
 
   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);
 }
 
 }  // namespace
 
 namespace gfx {
 
 CanvasSkia::CanvasSkia(int width, int height, bool is_opaque)
     : skia::PlatformCanvas(width, height, is_opaque) {
 }
@@ skipping 67 matching lines @@
   DrawStringContext context(this, text, font, bounds, bounds, flags);
   context.Draw(color);
 }
 
 void CanvasSkia::DrawGdkPixbuf(GdkPixbuf* pixbuf, int x, int y) {
   if (!pixbuf) {
     NOTREACHED();
     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);
 }
 
 ui::TextureID CanvasSkia::GetTextureID() {
   // TODO(wjmaclean)
   return 0;
 }
 
 }  // namespace gfx