[NOT FOR COMMIT] Fully replace SkCanvas uses.

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

Index: third_party/WebKit/Source/platform/graphics/ImageBuffer.h
diff --git a/third_party/WebKit/Source/platform/graphics/ImageBuffer.h b/third_party/WebKit/Source/platform/graphics/ImageBuffer.h
index ba8e471aab88383ec77a8955d99036c248abf69c..dd866d58d4fb48c00ad86a0bf49b026342fe3284 100644
--- a/third_party/WebKit/Source/platform/graphics/ImageBuffer.h
+++ b/third_party/WebKit/Source/platform/graphics/ImageBuffer.h
@@ -37,7 +37,7 @@
 #include "platform/graphics/ImageBufferSurface.h"
 #include "platform/transforms/AffineTransform.h"
 #include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/core/SkPicture.h"
+#include "skia/ext/cdl_picture.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "wtf/Forward.h"
 #include "wtf/PassRefPtr.h"
@@ -110,9 +110,9 @@ class PLATFORM_EXPORT ImageBuffer {
 
   // Called by subclasses of ImageBufferSurface to install a new canvas object.
   // Virtual for mocking
-  virtual void resetCanvas(SkCanvas*) const;
+  virtual void resetCanvas(CdlCanvas*) const;
 
-  SkCanvas* canvas() const;
+  CdlCanvas* canvas() const;
   void disableDeferral(DisableDeferralReason) const;
 
   // Called at the end of a task that rendered a whole frame
@@ -169,7 +169,7 @@ class PLATFORM_EXPORT ImageBuffer {
       AccelerationHint = PreferNoAcceleration,
       SnapshotReason = SnapshotReasonUnknown) const;
 
-  sk_sp<SkPicture> getPicture() { return m_surface->getPicture(); }
+  sk_sp<CdlPicture> getPicture() { return m_surface->getPicture(); }
 
   void draw(GraphicsContext&, const FloatRect&, const FloatRect*, SkBlendMode);