Relanding this with fixes to the mac dbg builder

webkit/plugins/ppapi/ppb_graphics_2d_impl.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 "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
 
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 380 matching lines @@
                         y + image_resource->height() };
   SkRect dest_rect = { SkIntToScalar(0),
                        SkIntToScalar(0),
                        SkIntToScalar(image_resource->width()),
                        SkIntToScalar(image_resource->height()) };
 
   if (image_resource->format() != image_data_->format()) {
     // Convert the image data if the format does not match.
     ConvertImageData(image_data_, src_irect, image_resource, dest_rect);
   } else {
-    skia::PlatformCanvas* dest_canvas = image_resource->mapped_canvas();
+    skia::PlatformCanvas* dest_canvas = image_resource->GetPlatformCanvas();
 
     // 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(),
                                 &src_irect, dest_rect, &paint);
   }
   return true;
 }
 
@@ skipping 164 matching lines @@
   SkRect dest_rect = { SkIntToScalar(invalidated_rect->x()),
                        SkIntToScalar(invalidated_rect->y()),
                        SkIntToScalar(invalidated_rect->right()),
                        SkIntToScalar(invalidated_rect->bottom()) };
 
   if (image->format() != image_data_->format()) {
     // Convert the image data if the format does not match.
     ConvertImageData(image, src_irect, image_data_, dest_rect);
   } else {
     // We're guaranteed to have a mapped canvas since we mapped it in Init().
-    skia::PlatformCanvas* backing_canvas = image_data_->mapped_canvas();
+    skia::PlatformCanvas* backing_canvas = image_data_->GetPlatformCanvas();
 
     // We want to replace the contents of the bitmap rather than blend.
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     backing_canvas->drawBitmapRect(*image->GetMappedBitmap(),
                                    &src_irect, dest_rect, &paint);
   }
 }
 
 void PPB_Graphics2D_Impl::ExecuteScroll(const gfx::Rect& clip,
                                         int dx, int dy,
                                         gfx::Rect* invalidated_rect) {
-  gfx::ScrollCanvas(image_data_->mapped_canvas(),
+  gfx::ScrollCanvas(image_data_->GetPlatformCanvas(),
                     clip, gfx::Point(dx, dy));
   *invalidated_rect = clip;
 }
 
 void PPB_Graphics2D_Impl::ExecuteReplaceContents(PPB_ImageData_Impl* image,
                                                  gfx::Rect* invalidated_rect) {
   if (image->format() != image_data_->format()) {
     DCHECK(image->width() == image_data_->width() &&
            image->height() == image_data_->height());
     // Convert the image data if the format does not match.
@@ skipping 37 matching lines @@
 }
 
 bool PPB_Graphics2D_Impl::HasPendingFlush() const {
   return !unpainted_flush_callback_.is_null() ||
          !painted_flush_callback_.is_null() ||
          offscreen_flush_pending_;
 }
 
 }  // namespace ppapi
 }  // namespace webkit