[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/platform/graphics/BitmapImage.cpp

Index: third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp b/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
index 5cd759c6dbf5937ca00aefae778bc9e647accec9..f87ff973611c3322262349e6ae423723e9563e21 100644
--- a/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
+++ b/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
@@ -36,6 +36,8 @@
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "platform/tracing/TraceEvent.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "skia/ext/cdl_canvas.h"
+#include "skia/ext/cdl_paint.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/text/WTFString.h"
@@ -240,8 +242,8 @@ String BitmapImage::filenameExtension() const {
 }
 
 void BitmapImage::draw(
-    SkCanvas* canvas,
-    const SkPaint& paint,
+    CdlCanvas* canvas,
+    const CdlPaint& paint,
     const FloatRect& dstRect,
     const FloatRect& srcRect,
     RespectImageOrientationEnum shouldRespectImageOrientation,
@@ -262,7 +264,7 @@ void BitmapImage::draw(
   if (shouldRespectImageOrientation == RespectImageOrientation)
     orientation = frameOrientationAtIndex(m_currentFrame);
 
-  SkAutoCanvasRestore autoRestore(canvas, false);
+  CdlAutoCanvasRestore autoRestore(canvas, false);
   FloatRect adjustedDstRect = dstRect;
   if (orientation != DefaultImageOrientation) {
     canvas->save();