[NOT FOR COMMIT] Fully replace SkCanvas uses.

content/renderer/pepper/ppb_image_data_impl.h

Index: content/renderer/pepper/ppb_image_data_impl.h
diff --git a/content/renderer/pepper/ppb_image_data_impl.h b/content/renderer/pepper/ppb_image_data_impl.h
index 81c9a5a68ebd4631b9c854628a7baf7689392467..10d29b7e1d67d72675ca3bf3866d8ebfba1d1e77 100644
--- a/content/renderer/pepper/ppb_image_data_impl.h
+++ b/content/renderer/pepper/ppb_image_data_impl.h
@@ -16,10 +16,10 @@
 #include "ppapi/shared_impl/ppb_image_data_shared.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
-#include "third_party/skia/include/core/SkCanvas.h"
+#include "skia/ext/cdl_common.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 class SkBitmap;
-class SkCanvas;
 class TransportDIB;
 
 namespace base {
@@ -51,8 +51,8 @@ class CONTENT_EXPORT PPB_ImageData_Impl
     virtual void Unmap() = 0;
     virtual int32_t GetSharedMemory(base::SharedMemory** shm,
                                     uint32_t* byte_count) = 0;
-    virtual SkCanvas* GetPlatformCanvas() = 0;
-    virtual SkCanvas* GetCanvas() = 0;
+    virtual CdlCanvas* GetPlatformCanvas() = 0;
+    virtual CdlCanvas* GetCanvas() = 0;
     virtual SkBitmap GetMappedBitmap() const = 0;
   };
 
@@ -97,8 +97,8 @@ class CONTENT_EXPORT PPB_ImageData_Impl
   void Unmap() override;
   int32_t GetSharedMemory(base::SharedMemory** shm,
                           uint32_t* byte_count) override;
-  SkCanvas* GetPlatformCanvas() override;
-  SkCanvas* GetCanvas() override;
+  CdlCanvas* GetPlatformCanvas() override;
+  CdlCanvas* GetCanvas() override;
   void SetIsCandidateForReuse() override;
 
   // Returns an *empty* bitmap on error.
@@ -137,8 +137,8 @@ class ImageDataPlatformBackend : public PPB_ImageData_Impl::Backend {
   void Unmap() override;
   int32_t GetSharedMemory(base::SharedMemory** shm,
                           uint32_t* byte_count) override;
-  SkCanvas* GetPlatformCanvas() override;
-  SkCanvas* GetCanvas() override;
+  CdlCanvas* GetPlatformCanvas() override;
+  CdlCanvas* GetCanvas() override;
   SkBitmap GetMappedBitmap() const override;
 
  private:
@@ -149,7 +149,7 @@ class ImageDataPlatformBackend : public PPB_ImageData_Impl::Backend {
   std::unique_ptr<TransportDIB> dib_;
 
   // When the device is mapped, this is the image. Null when umapped.
-  std::unique_ptr<SkCanvas> mapped_canvas_;
+  std::unique_ptr<CdlCanvas> mapped_canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageDataPlatformBackend);
 };
@@ -171,15 +171,15 @@ class ImageDataSimpleBackend : public PPB_ImageData_Impl::Backend {
   void Unmap() override;
   int32_t GetSharedMemory(base::SharedMemory** shm,
                           uint32_t* byte_count) override;
-  SkCanvas* GetPlatformCanvas() override;
-  SkCanvas* GetCanvas() override;
+  CdlCanvas* GetPlatformCanvas() override;
+  CdlCanvas* GetCanvas() override;
   SkBitmap GetMappedBitmap() const override;
 
  private:
   std::unique_ptr<base::SharedMemory> shared_memory_;
   // skia_bitmap_ is backed by shared_memory_.
   SkBitmap skia_bitmap_;
-  std::unique_ptr<SkCanvas> skia_canvas_;
+  std::unique_ptr<CdlCanvas> skia_canvas_;
   uint32_t map_count_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageDataSimpleBackend);