[NOT FOR COMMIT] Fully replace SkCanvas uses.

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

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ImageBufferSurface_h
 #define ImageBufferSurface_h
 
 #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"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 
-class SkCanvas;
 class SkColorSpace;
 class SkImage;
 struct SkImageInfo;
-class SkPicture;
 
 namespace blink {
 
 class ImageBuffer;
 class WebLayer;
 class FloatRect;
 class GraphicsContext;
 
 class PLATFORM_EXPORT ImageBufferSurface {
   WTF_MAKE_NONCOPYABLE(ImageBufferSurface);
   USING_FAST_MALLOC(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) {}
   virtual bool isValid() const = 0;
   virtual bool restore() { return false; }
   virtual WebLayer* layer() const { return 0; }
   virtual bool isAccelerated() const { return false; }
   virtual bool isRecording() const { return false; }
   virtual bool isExpensiveToPaint() { return false; }
   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,
                     const FloatRect& srcRect,
                     SkBlendMode);
   virtual void setHasExpensiveOp() {}
   virtual GLuint getBackingTextureHandleForOverwrite() { return 0; }
 
   // Executes all deferred rendering immediately.
   virtual void flush(FlushReason);
@@ skipping 29 matching lines @@
  private:
   OpacityMode m_opacityMode;
   IntSize m_size;
   sk_sp<SkColorSpace> m_colorSpace;
   SkColorType m_colorType;
 };
 
 }  // namespace blink
 
 #endif