[NOT FOR COMMIT] Fully replace SkCanvas uses.

ppapi/proxy/ppb_image_data_proxy.cc

 // 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.
 
 #include "ppapi/proxy/ppb_image_data_proxy.h"
 
 #include <string.h>  // For memcpy
 
 #include <map>
 #include <vector>
@@ skipping 386 matching lines @@
   skia::GetWritablePixels(mapped_canvas_.get(), &pixmap);
   return pixmap.writable_addr();
 }
 
 void PlatformImageData::Unmap() {
   // TODO(brettw) have a way to unmap a TransportDIB. Currently this isn't
   // possible since deleting the TransportDIB also frees all the handles.
   // We need to add a method to TransportDIB to release the handles.
 }
 
-SkCanvas* PlatformImageData::GetPlatformCanvas() {
+CdlCanvas* PlatformImageData::GetPlatformCanvas() {
   return mapped_canvas_.get();
 }
 
-SkCanvas* PlatformImageData::GetCanvas() {
+CdlCanvas* PlatformImageData::GetCanvas() {
   return mapped_canvas_.get();
 }
 
 // static
 ImageHandle PlatformImageData::NullHandle() {
   return ImageHandle();
 }
 #endif  // !defined(OS_NACL)
 
 // SimpleImageData -------------------------------------------------------------
@@ skipping 14 matching lines @@
   if (map_count_++ == 0)
     shm_.Map(size_);
   return shm_.memory();
 }
 
 void SimpleImageData::Unmap() {
   if (--map_count_ == 0)
     shm_.Unmap();
 }
 
-SkCanvas* SimpleImageData::GetPlatformCanvas() {
+CdlCanvas* SimpleImageData::GetPlatformCanvas() {
   return NULL;  // No canvas available.
 }
 
-SkCanvas* SimpleImageData::GetCanvas() {
+CdlCanvas* SimpleImageData::GetCanvas() {
   return NULL;  // No canvas available.
 }
 
 // PPB_ImageData_Proxy ---------------------------------------------------------
 
 PPB_ImageData_Proxy::PPB_ImageData_Proxy(Dispatcher* dispatcher)
     : InterfaceProxy(dispatcher) {
 }
 
 PPB_ImageData_Proxy::~PPB_ImageData_Proxy() {
@@ skipping 207 matching lines @@
   // still cached in our process, the proxy still holds a reference so we can
   // remove the one the renderer just sent is. If the proxy no longer holds a
   // reference, we released everything and we should also release the one the
   // renderer just sent us.
   dispatcher()->Send(new PpapiHostMsg_PPBCore_ReleaseResource(
       API_ID_PPB_CORE, old_image_data));
 }
 
 }  // namespace proxy
 }  // namespace ppapi