1 files changed, 27 insertions, 31 deletions

diff --git a/ui/gfx/canvas_skia_linux.cc b/ui/gfx/canvas_skia_linux.cc
index 1d5d298..796bfb8 100644
--- a/ui/gfx/canvas_skia_linux.cc
+++ b/ui/gfx/canvas_skia_linux.cc
@@ -208,7 +208,7 @@ DrawStringContext::DrawStringContext(gfx::CanvasSkia* canvas,
       text_height_(0) {
   DCHECK(!bounds_.IsEmpty());
 
-  cr_ = skia::BeginPlatformPaint(canvas_);
+  cr_ = canvas_->beginPlatformPaint();
   layout_ = pango_cairo_create_layout(cr_);
 
   SetupPangoLayout(layout_, text, font, bounds_.width(), flags_);
@@ -246,10 +246,8 @@ DrawStringContext::~DrawStringContext() {
   }
   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) {
@@ -268,33 +266,32 @@ void DrawStringContext::DrawWithHalo(const SkColor& text_color,
   text_canvas.FillRectInt(static_cast<SkColor>(0),
       0, 0, bounds_.width() + 2, bounds_.height() + 2);
 
-  {
-    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_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_t* text_cr = text_canvas.beginPlatformPaint();
+
+  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_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&>(
-      skia::GetTopDevice(text_canvas)->accessBitmap(false));
+      text_canvas.getTopPlatformDevice().accessBitmap(false));
   canvas_->DrawBitmapInt(text_bitmap, text_x_ - 1, text_y_ - 1);
 }
 
@@ -382,8 +379,7 @@ void CanvasSkia::DrawGdkPixbuf(GdkPixbuf* pixbuf, int x, int y) {
     return;
   }
 
-  skia::ScopedPlatformPaint scoped_platform_paint(this);
-  cairo_t* cr = scoped_platform_paint.GetPlatformSurface();
+  cairo_t* cr = beginPlatformPaint();
   gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
   cairo_paint(cr);
 }