[NOT FOR COMMIT] Fully replace SkCanvas uses.

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

Index: third_party/WebKit/Source/platform/graphics/PlaceholderImage.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/PlaceholderImage.cpp b/third_party/WebKit/Source/platform/graphics/PlaceholderImage.cpp
index a2df199d0260d012e7cf1726e4bf7c21a1098531..e206c85fa2bf22dae538becfd3bce7254f92018a 100644
--- a/third_party/WebKit/Source/platform/graphics/PlaceholderImage.cpp
+++ b/third_party/WebKit/Source/platform/graphics/PlaceholderImage.cpp
@@ -12,7 +12,7 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.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/SkRect.h"
 #include "third_party/skia/include/core/SkSize.h"
 
@@ -41,14 +41,14 @@ sk_sp<SkImage> PlaceholderImage::imageForCurrentFrame() {
   context.fillRect(destRect);
 
   m_imageForCurrentFrame = SkImage::MakeFromPicture(
-      builder.endRecording(), SkISize::Make(m_size.width(), m_size.height()),
-      nullptr, nullptr);
+      ToSkPicture(builder.endRecording().get()),
+      SkISize::Make(m_size.width(), m_size.height()), nullptr, nullptr);
 
   return m_imageForCurrentFrame;
 }
 
-void PlaceholderImage::draw(SkCanvas* canvas,
-                            const SkPaint& basePaint,
+void PlaceholderImage::draw(CdlCanvas* canvas,
+                            const CdlPaint& basePaint,
                             const FloatRect& destRect,
                             const FloatRect& srcRect,
                             RespectImageOrientationEnum,
@@ -59,8 +59,8 @@ void PlaceholderImage::draw(SkCanvas* canvas,
     return;
   }
 
-  SkPaint paint(basePaint);
-  paint.setStyle(SkPaint::kFill_Style);
+  CdlPaint paint(basePaint);
+  paint.setStyle(CdlPaint::kFill_Style);
   paint.setColor(kFillColor);
   canvas->drawRect(destRect, paint);
 }