Relanding this with fixes to the mac dbg builder

webkit/plugins/ppapi/ppb_flash_impl.cc

 // Copyright (c) 2012 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_flash_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/message_loop.h"
@@ skipping 71 matching lines @@
   if (font_desc->italic)
     style |= SkTypeface::kItalic;
   SkTypeface* typeface =
       SkTypeface::CreateFromName(face_name->value().c_str(),
                                  static_cast<SkTypeface::Style>(style));
   if (!typeface)
     return PP_FALSE;
   SkAutoUnref aur(typeface);
 
   // Set up the canvas.
-  SkCanvas* canvas = image_resource->mapped_canvas();
+  SkCanvas* canvas = image_resource->GetPlatformCanvas();
   SkAutoCanvasRestore acr(canvas, true);
 
   // Clip is applied in pixels before the transform.
   SkRect clip_rect = { clip->point.x, clip->point.y,
                        clip->point.x + clip->size.width,
                        clip->point.y + clip->size.height };
   canvas->clipRect(clip_rect);
 
   // Convert & set the matrix.
   SkMatrix matrix;
@@ skipping 171 matching lines @@
   return &ppb_flash_11;
 }
 
 // static
 const PPB_Flash_12_0* PPB_Flash_Impl::GetInterface12_0() {
   return &ppb_flash_12;
 }
 
 }  // namespace ppapi
 }  // namespace webkit