3 files changed, 6 insertions, 6 deletions
diff --git a/ui/base/clipboard/clipboard_linux.cc b/ui/base/clipboard/clipboard_linux.cc
index 13cc759..883dcf5 100644
--- a/ui/base/clipboard/clipboard_linux.cc
+++ b/ui/base/clipboard/clipboard_linux.cc
@@ -388,10 +388,10 @@ SkBitmap Clipboard::ReadImage(Buffer buffer) const {
   gfx::CanvasSkia canvas(gdk_pixbuf_get_width(pixbuf.get()),
                          gdk_pixbuf_get_height(pixbuf.get()),
                          false);
-  skia::ScopedPlatformPaint scoped_platform_paint(&canvas);
-  cairo_t* context = scoped_platform_paint.GetPlatformSurface();
+  cairo_t* context = canvas.beginPlatformPaint();
   gdk_cairo_set_source_pixbuf(context, pixbuf.get(), 0.0, 0.0);
   cairo_paint(context);
+  canvas.endPlatformPaint();
   return canvas.ExtractBitmap();
 }
 
diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm
index eb89565..63d456b 100644
--- a/ui/base/clipboard/clipboard_mac.mm
+++ b/ui/base/clipboard/clipboard_mac.mm
@@ -253,8 +253,7 @@ SkBitmap Clipboard::ReadImage(Buffer buffer) const {
     int height = [image size].height;
 
     gfx::CanvasSkia canvas(width, height, false);
-    skia::ScopedPlatformPaint scoped_platform_paint(&canvas);
-    CGContextRef gc = scoped_platform_paint.GetPlatformSurface();
+    CGContextRef gc = canvas.beginPlatformPaint();
     NSGraphicsContext* cocoa_gc =
         [NSGraphicsContext graphicsContextWithGraphicsPort:gc flipped:NO];
     [NSGraphicsContext setCurrentContext:cocoa_gc];
@@ -263,6 +262,7 @@ SkBitmap Clipboard::ReadImage(Buffer buffer) const {
             operation:NSCompositeCopy
              fraction:1.0];
     [NSGraphicsContext restoreGraphicsState];
+    canvas.endPlatformPaint();
     return canvas.ExtractBitmap();
   }
   return SkBitmap();
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index eb4f34b..013da58 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -456,9 +456,9 @@ SkBitmap Clipboard::ReadImage(Buffer buffer) const {
 
   gfx::CanvasSkia canvas(width, height, false);
 
-  skia::ScopedPlatformPaint scoped_platform_paint(&canvas);
-  HDC destination_dc = scoped_platform_paint.GetPlatformSurface();
+  HDC destination_dc = canvas.beginPlatformPaint();
   ::BitBlt(destination_dc, 0, 0, width, height, source_dc, 0, 0, SRCCOPY);
+  canvas.endPlatformPaint();
   return canvas.ExtractBitmap();
 }