Relanding this with fixes to the mac dbg builder

webkit/plugins/ppapi/ppb_image_data_impl.h

Index: webkit/plugins/ppapi/ppb_image_data_impl.h
===================================================================
--- webkit/plugins/ppapi/ppb_image_data_impl.h	(revision 118405)
+++ webkit/plugins/ppapi/ppb_image_data_impl.h	(working copy)
@@ -63,9 +63,8 @@
   virtual void* Map() OVERRIDE;
   virtual void Unmap() OVERRIDE;
   virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) OVERRIDE;
+  virtual skia::PlatformCanvas* GetPlatformCanvas() OVERRIDE;
 
-  // The mapped bitmap and canvas will be NULL if the image is not mapped.
-  skia::PlatformCanvas* mapped_canvas() const { return mapped_canvas_.get(); }
   const SkBitmap* GetMappedBitmap() const;
 
   // Swaps the guts of this image data with another.