[NOT FOR COMMIT] Fully replace SkCanvas uses.

content/renderer/pepper/ppb_image_data_impl.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 CONTENT_RENDERER_PEPPER_PPB_IMAGE_DATA_IMPL_H_
 #define CONTENT_RENDERER_PEPPER_PPB_IMAGE_DATA_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "content/common/content_export.h"
 #include "ppapi/c/ppb_image_data.h"
 #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 {
 class SharedMemory;
 }
 
 namespace content {
 
 class CONTENT_EXPORT PPB_ImageData_Impl
     : public ppapi::Resource,
@@ skipping 11 matching lines @@
                       PP_ImageDataFormat format,
                       int width,
                       int height,
                       bool init_to_zero) = 0;
     virtual bool IsMapped() const = 0;
     virtual TransportDIB* GetTransportDIB() const = 0;
     virtual void* Map() = 0;
     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;
   };
 
   // If you call this constructor, you must also call Init before use. Normally
   // you should use the static Create function, but this constructor is needed
   // for some internal uses of ImageData (like Graphics2D).
   PPB_ImageData_Impl(PP_Instance instance,
                      PPB_ImageData_Shared::ImageDataType type);
 
   // Constructor used for unittests. The ImageData is always allocated locally.
@@ skipping 24 matching lines @@
 
   // Resource override.
   ppapi::thunk::PPB_ImageData_API* AsPPB_ImageData_API() override;
 
   // PPB_ImageData_API implementation.
   PP_Bool Describe(PP_ImageDataDesc* desc) override;
   void* Map() override;
   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.
   // Users must call SkBitmap::lockPixels() before SkBitmap::getPixels();
   // unlockPixels() will be automatically invoked if necessary when the
   // bitmap goes out of scope.
   SkBitmap GetMappedBitmap() const;
 
  private:
   ~PPB_ImageData_Impl() override;
@@ skipping 18 matching lines @@
             PP_ImageDataFormat format,
             int width,
             int height,
             bool init_to_zero) override;
   bool IsMapped() const override;
   TransportDIB* GetTransportDIB() const override;
   void* Map() override;
   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:
   // This will be NULL before initialization, and if this PPB_ImageData_Impl is
   // swapped with another.
   int width_;
   int height_;
   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);
 };
 
 class ImageDataSimpleBackend : public PPB_ImageData_Impl::Backend {
  public:
   ImageDataSimpleBackend();
   ~ImageDataSimpleBackend() override;
 
   // PPB_ImageData_Impl::Backend implementation.
   bool Init(PPB_ImageData_Impl* impl,
             PP_ImageDataFormat format,
             int width,
             int height,
             bool init_to_zero) override;
   bool IsMapped() const override;
   TransportDIB* GetTransportDIB() const override;
   void* Map() override;
   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);
 };
 
 // Manages mapping an image resource if necessary. Use this to ensure the
 // image is mapped. The destructor will put the image back into the previous
 // state. You must check is_valid() to make sure the image was successfully
 // mapped before using it.
 //
@@ skipping 27 matching lines @@
   PPB_ImageData_Impl* image_data_;
   bool is_valid_;
   bool needs_unmap_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageDataAutoMapper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PPB_IMAGE_DATA_IMPL_H_