[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/playback/display_item.h

Index: cc/playback/display_item.h
diff --git a/cc/playback/display_item.h b/cc/playback/display_item.h
index 08d3d0116347027ca8158e250615cd94f5c2db6f..a61a26b449e559347c73132503f5020f858722f0 100644
--- a/cc/playback/display_item.h
+++ b/cc/playback/display_item.h
@@ -13,6 +13,8 @@
 #include "cc/debug/traced_value.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/geometry/rect.h"
+#include "skia/ext/cdl_picture.h"
+#include "skia/ext/cdl_canvas.h"
 
 class SkCanvas;
 
@@ -27,8 +29,8 @@ class CC_EXPORT DisplayItem {
   virtual ~DisplayItem() {}
 
   virtual void ToProtobuf(proto::DisplayItem* proto) const = 0;
-  virtual sk_sp<const SkPicture> GetPicture() const;
-  virtual void Raster(SkCanvas* canvas,
+  virtual sk_sp<const CdlPicture> GetPicture() const;
+  virtual void Raster(CdlCanvas* canvas,
                       SkPicture::AbortCallback* callback) const = 0;
   virtual void AsValueInto(const gfx::Rect& visual_rect,
                            base::trace_event::TracedValue* array) const = 0;