[NOT FOR COMMIT] Fully replace SkCanvas uses.

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

Index: third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h
diff --git a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h
index 6148e2b90b682ffc22ab99d3e4d8ffc5fadd761b..59db3575d251397741e668495f9bc2e489dbf01d 100644
--- a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h
+++ b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h
@@ -8,15 +8,12 @@
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/ImageBufferSurface.h"
 #include "public/platform/WebThread.h"
+#include "skia/ext/cdl_common.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 #include <memory>
 
-class SkCanvas;
-class SkPicture;
-class SkPictureRecorder;
-
 namespace blink {
 
 class ImageBuffer;
@@ -56,9 +53,9 @@ class PLATFORM_EXPORT RecordingImageBufferSurface : public ImageBufferSurface {
   ~RecordingImageBufferSurface() override;
 
   // Implementation of ImageBufferSurface interfaces
-  SkCanvas* canvas() override;
+  CdlCanvas* canvas() override;
   void disableDeferral(DisableDeferralReason) override;
-  sk_sp<SkPicture> getPicture() override;
+  sk_sp<CdlPicture> getPicture() override;
   void flush(FlushReason) override;
   void didDraw(const FloatRect&) override;
   bool isValid() const override { return true; }
@@ -123,8 +120,8 @@ class PLATFORM_EXPORT RecordingImageBufferSurface : public ImageBufferSurface {
   bool finalizeFrameInternal(FallbackReason*);
   int approximateOpCount();
 
-  std::unique_ptr<SkPictureRecorder> m_currentFrame;
-  sk_sp<SkPicture> m_previousFrame;
+  std::unique_ptr<CdlPictureRecorder> m_currentFrame;
+  sk_sp<CdlPicture> m_previousFrame;
   std::unique_ptr<ImageBufferSurface> m_fallbackSurface;
   ImageBuffer* m_imageBuffer;
   int m_initialSaveCount;