[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/playback/drawing_display_item.h

Index: cc/playback/drawing_display_item.h
diff --git a/cc/playback/drawing_display_item.h b/cc/playback/drawing_display_item.h
index 0bad775357e5a6a349f0ef5d1d57370952a3e3bf..89e652867644de48bde45cb20f2527d77c656f3f 100644
--- a/cc/playback/drawing_display_item.h
+++ b/cc/playback/drawing_display_item.h
@@ -12,6 +12,7 @@
 
 #include "cc/base/cc_export.h"
 #include "cc/playback/display_item.h"
+#include "skia/ext/cdl_common.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "ui/gfx/geometry/point_f.h"
 
@@ -24,7 +25,7 @@ class ClientPictureCache;
 class CC_EXPORT DrawingDisplayItem : public DisplayItem {
  public:
   DrawingDisplayItem();
-  explicit DrawingDisplayItem(sk_sp<const SkPicture> picture);
+  explicit DrawingDisplayItem(sk_sp<const CdlPicture> picture);
   explicit DrawingDisplayItem(const proto::DisplayItem& proto,
                               ClientPictureCache* client_picture_cache,
                               std::vector<uint32_t>* used_engine_picture_ids);
@@ -32,8 +33,8 @@ class CC_EXPORT DrawingDisplayItem : public DisplayItem {
   ~DrawingDisplayItem() override;
 
   void ToProtobuf(proto::DisplayItem* proto) const override;
-  sk_sp<const SkPicture> GetPicture() const override;
-  void Raster(SkCanvas* canvas,
+  sk_sp<const CdlPicture> GetPicture() const override;
+  void Raster(CdlCanvas* canvas,
               SkPicture::AbortCallback* callback) const override;
   void AsValueInto(const gfx::Rect& visual_rect,
                    base::trace_event::TracedValue* array) const override;
@@ -44,9 +45,9 @@ class CC_EXPORT DrawingDisplayItem : public DisplayItem {
   void CloneTo(DrawingDisplayItem* item) const;
 
  private:
-  void SetNew(sk_sp<const SkPicture> picture);
+  void SetNew(sk_sp<const CdlPicture> picture);
 
-  sk_sp<const SkPicture> picture_;
+  sk_sp<const CdlPicture> picture_;
 };
 
 }  // namespace cc