Out of process Pepper

webkit/glue/plugins/pepper_graphics_2d.cc

 // Copyright (c) 2010 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 "webkit/glue/plugins/pepper_graphics_2d.h"
 
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 401 matching lines @@
     return false;
 
   SkIRect src_irect = { x, y,
                         x + image_resource->width(),
                         y + image_resource->height() };
   SkRect dest_rect = { SkIntToScalar(0),
                        SkIntToScalar(0),
                        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);
   } else {
     skia::PlatformCanvas* dest_canvas = image_resource->mapped_canvas();
 
     // We want to replace the contents of the bitmap rather than blend.
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     dest_canvas->drawBitmapRect(*image_data_->GetMappedBitmap(),
@@ skipping 32 matching lines @@
     new_instance->InvalidateRect(gfx::Rect());
   }
 
   bound_instance_ = new_instance;
   return true;
 }
 
 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)
   SkAutoLockPixels lock(backing_bitmap);
 
   base::mac::ScopedCFTypeRef<CGDataProviderRef> data_provider(
       CGDataProviderCreateWithData(
           NULL, backing_bitmap.getAddr32(0, 0),
           backing_bitmap.rowBytes() * backing_bitmap.height(), NULL));
   base::mac::ScopedCFTypeRef<CGImageRef> image(
@@ skipping 142 matching lines @@
   data.Execute(PP_OK);
 }
 
 bool Graphics2D::HasPendingFlush() const {
   return !unpainted_flush_callback_.is_null() ||
          !painted_flush_callback_.is_null() ||
          offscreen_flush_pending_;
 }
 
 }  // namespace pepper