[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h

Index: third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h
diff --git a/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h b/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h
index 06ed4634b7f94d0083f50c17aa3071edd49b88fd..f8a835f47cf1984a21ace27f4412329b7360ee8b 100644
--- a/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h
+++ b/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h
@@ -34,6 +34,7 @@
 #include "platform/PlatformExport.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/GraphicsTypes.h"
+#include "skia/ext/cdl_common.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ -41,11 +42,9 @@
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 
-class SkCanvas;
 class SkColorSpace;
 class SkImage;
 struct SkImageInfo;
-class SkPicture;
 
 namespace blink {
 
@@ -61,7 +60,7 @@ class PLATFORM_EXPORT ImageBufferSurface {
  public:
   virtual ~ImageBufferSurface();
 
-  virtual SkCanvas* canvas() = 0;
+  virtual CdlCanvas* canvas() = 0;
   virtual void disableDeferral(DisableDeferralReason) {}
   virtual void willOverwriteCanvas() {}
   virtual void didDraw(const FloatRect& rect) {}
@@ -74,7 +73,7 @@ class PLATFORM_EXPORT ImageBufferSurface {
   virtual void setFilterQuality(SkFilterQuality) {}
   virtual void setIsHidden(bool) {}
   virtual void setImageBuffer(ImageBuffer*) {}
-  virtual sk_sp<SkPicture> getPicture();
+  virtual sk_sp<CdlPicture> getPicture();
   virtual void finalizeFrame(const FloatRect& dirtyRect) {}
   virtual void draw(GraphicsContext&,
                     const FloatRect& destRect,