[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h

Index: third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h
diff --git a/third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h b/third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h
index a6b3d4c1c152cd9e57165ee07b9fc9972152f7fb..dce93f8e446b0e9243c97701c0c8f349cdf99439 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h
+++ b/third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h
@@ -8,19 +8,19 @@
 #include "platform/PlatformExport.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/paint/DisplayItemClient.h"
+#include "skia/ext/cdl_common.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "wtf/Noncopyable.h"
 #include <memory>
 
 class SkMetaData;
-class SkPicture;
 
 namespace blink {
 
 class GraphicsContext;
 class PaintController;
 
-// When slimming paint ships we can remove this SkPicture abstraction and
+// When slimming paint ships we can remove this CdlPicture abstraction and
 // rely on PaintController here.
 class PLATFORM_EXPORT SkPictureBuilder final : public DisplayItemClient {
   WTF_MAKE_NONCOPYABLE(SkPictureBuilder);
@@ -45,7 +45,7 @@ class PLATFORM_EXPORT SkPictureBuilder final : public DisplayItemClient {
 
   // Returns a picture capturing all drawing performed on the builder's context
   // since construction.
-  sk_sp<SkPicture> endRecording();
+  sk_sp<CdlPicture> endRecording();
 
   // DisplayItemClient methods
   String debugName() const final { return "SkPictureBuilder"; }