Out of process Pepper

webkit/glue/plugins/pepper_graphics_2d.cc

Index: webkit/glue/plugins/pepper_graphics_2d.cc
===================================================================
--- webkit/glue/plugins/pepper_graphics_2d.cc	(revision 65099)
+++ webkit/glue/plugins/pepper_graphics_2d.cc	(working copy)
@@ -419,6 +419,7 @@
                        SkIntToScalar(image_resource->width()),
                        SkIntToScalar(image_resource->height()) };
 
+  ImageDataAutoMapper auto_mapper2(image_data_);
   if (image_resource->format() != image_data_->format()) {
     // Convert the image data if the format does not match.
     ConvertImageData(image_data_, src_irect, image_resource.get(), dest_rect);
@@ -471,7 +472,7 @@
 void Graphics2D::Paint(WebKit::WebCanvas* canvas,
                        const gfx::Rect& plugin_rect,
                        const gfx::Rect& paint_rect) {
-  // We're guaranteed to have a mapped canvas since we mapped it in Init().
+  ImageDataAutoMapper auto_mapper(image_data_);
   const SkBitmap& backing_bitmap = *image_data_->GetMappedBitmap();
 
 #if defined(OS_MACOSX)