Relanding this with fixes to the mac dbg builder

ppapi/proxy/ppb_image_data_proxy.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 "ppapi/proxy/ppb_image_data_proxy.h"
 
 #include <string.h>  // For memcpy
 
 #include <vector>
 
@@ skipping 59 matching lines @@
   // We need to add a method to TransportDIB to release the handles.
 }
 
 int32_t ImageData::GetSharedMemory(int* /* handle */,
                                    uint32_t* /* byte_count */) {
   // Not supported in the proxy (this method is for actually implementing the
   // proxy in the host).
   return PP_ERROR_NOACCESS;
 }
 
+skia::PlatformCanvas* ImageData::GetPlatformCanvas() {
+  return mapped_canvas_.get();
+}
+
 #if defined(OS_WIN)
 const ImageHandle ImageData::NullHandle = NULL;
 #elif defined(OS_MACOSX)
 const ImageHandle ImageData::NullHandle = ImageHandle();
 #else
 const ImageHandle ImageData::NullHandle = 0;
 #endif
 
 ImageHandle ImageData::HandleFromInt(int32_t i) {
 #if defined(OS_WIN)
@@ skipping 83 matching lines @@
     ImageHandle ih = ImageData::HandleFromInt(handle);
     *result_image_handle = dispatcher()->ShareHandleWithRemote(ih, false);
 #else
     *result_image_handle = ImageData::HandleFromInt(handle);
 #endif
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi