[NOT FOR COMMIT] Fully replace SkCanvas uses.

ppapi/proxy/ppb_image_data_proxy.h

Index: ppapi/proxy/ppb_image_data_proxy.h
diff --git a/ppapi/proxy/ppb_image_data_proxy.h b/ppapi/proxy/ppb_image_data_proxy.h
index 2b39aa0c8baebec049e1a4dc362a96ad960a3b51..a90b3a87f1e6e7386d3ca6f92e7ec840a79fae7e 100644
--- a/ppapi/proxy/ppb_image_data_proxy.h
+++ b/ppapi/proxy/ppb_image_data_proxy.h
@@ -27,6 +27,7 @@
 #include "ppapi/shared_impl/ppb_image_data_shared.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
+#include "skia/ext/cdl_common.h"
 
 #if !defined(OS_NACL)
 #include "third_party/skia/include/core/SkRefCnt.h"
@@ -95,8 +96,8 @@ class PPAPI_PROXY_EXPORT PlatformImageData : public ImageData {
   // PPB_ImageData API.
   void* Map() override;
   void Unmap() override;
-  SkCanvas* GetPlatformCanvas() override;
-  SkCanvas* GetCanvas() override;
+  CdlCanvas* GetPlatformCanvas() override;
+  CdlCanvas* GetCanvas() override;
 
   static ImageHandle NullHandle();
 
@@ -104,7 +105,7 @@ class PPAPI_PROXY_EXPORT PlatformImageData : public ImageData {
   std::unique_ptr<TransportDIB> transport_dib_;
 
   // Null when the image isn't mapped.
-  std::unique_ptr<SkCanvas> mapped_canvas_;
+  std::unique_ptr<CdlCanvas> mapped_canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformImageData);
 };
@@ -123,8 +124,8 @@ class PPAPI_PROXY_EXPORT SimpleImageData : public ImageData {
   // PPB_ImageData API.
   void* Map() override;
   void Unmap() override;
-  SkCanvas* GetPlatformCanvas() override;
-  SkCanvas* GetCanvas() override;
+  CdlCanvas* GetPlatformCanvas() override;
+  CdlCanvas* GetCanvas() override;
 
  private:
   base::SharedMemory shm_;