Relanding this with fixes to the mac dbg builder

ppapi/proxy/ppb_image_data_proxy.h

 // 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.
 
 #ifndef PPAPI_PPB_IMAGE_DATA_PROXY_H_
 #define PPAPI_PPB_IMAGE_DATA_PROXY_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_completion_callback.h"
@@ skipping 33 matching lines @@
   virtual ~ImageData();
 
   // Resource overrides.
   virtual ppapi::thunk::PPB_ImageData_API* AsPPB_ImageData_API() OVERRIDE;
 
   // PPB_ImageData API.
   virtual PP_Bool Describe(PP_ImageDataDesc* desc) OVERRIDE;
   virtual void* Map() OVERRIDE;
   virtual void Unmap() OVERRIDE;
   virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) OVERRIDE;
-
-  skia::PlatformCanvas* mapped_canvas() const { return mapped_canvas_.get(); }
+  virtual skia::PlatformCanvas* GetPlatformCanvas() OVERRIDE;
 
   const PP_ImageDataDesc& desc() const { return desc_; }
 
   static const ImageHandle NullHandle;
   static ImageHandle HandleFromInt(int32_t i);
 
  private:
   PP_ImageDataDesc desc_;
 
   scoped_ptr<TransportDIB> transport_dib_;
@@ skipping 29 matching lines @@
                        std::string* image_data_desc,
                        ImageHandle* result_image_handle);
 
   DISALLOW_COPY_AND_ASSIGN(PPB_ImageData_Proxy);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PPB_IMAGE_DATA_PROXY_H_