[NOT FOR COMMIT] Fully replace SkCanvas uses.

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 <stdint.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "build/build_config.h"
 #include "ipc/ipc_platform_file.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/proxy/serialized_structs.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 "skia/ext/cdl_common.h"
 
 #if !defined(OS_NACL)
 #include "third_party/skia/include/core/SkRefCnt.h"
 #endif  // !defined(OS_NACL)
 
 class TransportDIB;
 
 namespace ppapi {
 namespace proxy {
 
@@ skipping 48 matching lines @@
 class PPAPI_PROXY_EXPORT PlatformImageData : public ImageData {
  public:
   PlatformImageData(const ppapi::HostResource& resource,
                     const PP_ImageDataDesc& desc,
                     ImageHandle handle);
   ~PlatformImageData() override;
 
   // PPB_ImageData API.
   void* Map() override;
   void Unmap() override;
-  SkCanvas* GetPlatformCanvas() override;
-  SkCanvas* GetCanvas() override;
+  CdlCanvas* GetPlatformCanvas() override;
+  CdlCanvas* GetCanvas() override;
 
   static ImageHandle NullHandle();
 
  private:
   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);
 };
 #endif  // !defined(OS_NACL)
 
 // SimpleImageData is a simple, platform-independent image data resource which
 // can be used by NaCl. It can also be used by trusted apps when access to the
 // platform canvas isn't needed.
 class PPAPI_PROXY_EXPORT SimpleImageData : public ImageData {
  public:
   SimpleImageData(const ppapi::HostResource& resource,
                   const PP_ImageDataDesc& desc,
                   const base::SharedMemoryHandle& handle);
   ~SimpleImageData() override;
 
   // 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_;
   uint32_t size_;
   int map_count_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleImageData);
 };
 
 class PPB_ImageData_Proxy : public InterfaceProxy {
@@ skipping 53 matching lines @@
   // Host->Plugin message handlers.
   void OnPluginMsgNotifyUnusedImageData(const HostResource& old_image_data);
 
   DISALLOW_COPY_AND_ASSIGN(PPB_ImageData_Proxy);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PPB_IMAGE_DATA_PROXY_H_