Fix Clipboard::ReadImage

ui/base/clipboard/clipboard_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/base/clipboard/clipboard.h"
 
 #include <gtk/gtk.h>
 #include <map>
 #include <set>
 #include <string>
@@ skipping 370 matching lines @@
 
 SkBitmap Clipboard::ReadImage(Buffer buffer) const {
   ScopedGObject<GdkPixbuf>::Type pixbuf(
       gtk_clipboard_wait_for_image(clipboard_));
   if (!pixbuf.get())
     return SkBitmap();
 
   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();
-  gdk_cairo_set_source_pixbuf(context, pixbuf.get(), 0.0, 0.0);
-  cairo_paint(context);
+  {
+    skia::ScopedPlatformPaint scoped_platform_paint(&canvas);
+    cairo_t* context = scoped_platform_paint.GetPlatformSurface();
+    gdk_cairo_set_source_pixbuf(context, pixbuf.get(), 0.0, 0.0);
+    cairo_paint(context);
+  }
   return canvas.ExtractBitmap();
 }
 
 void Clipboard::ReadBookmark(string16* title, std::string* url) const {
   // TODO(estade): implement this.
   NOTIMPLEMENTED();
 }
 
 void Clipboard::ReadData(const std::string& format, std::string* result) {
   GtkSelectionData* data =
@@ skipping 49 matching lines @@
       return clipboard_;
     case BUFFER_SELECTION:
       return primary_selection_;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace ui