Rename paint data structures

cc/playback/clip_path_display_item.h

Index: cc/playback/clip_path_display_item.h
diff --git a/cc/playback/clip_path_display_item.h b/cc/playback/clip_path_display_item.h
index 33e648ef0c3f6bddf765bc63d6708b7ca2035129..4330411ffe7bd47a70ea804ebb6fc8f4bfb9cde9 100644
--- a/cc/playback/clip_path_display_item.h
+++ b/cc/playback/clip_path_display_item.h
@@ -11,11 +11,10 @@
 
 #include "base/memory/ptr_util.h"
 #include "cc/base/cc_export.h"
+#include "cc/paint/paint_canvas.h"
 #include "cc/playback/display_item.h"
 #include "third_party/skia/include/core/SkPath.h"
 
-class SkCanvas;
-
 namespace cc {
 
 class CC_EXPORT ClipPathDisplayItem : public DisplayItem {
@@ -25,8 +24,8 @@ class CC_EXPORT ClipPathDisplayItem : public DisplayItem {
   ~ClipPathDisplayItem() override;
 
   void ToProtobuf(proto::DisplayItem* proto) const override;
-  void Raster(SkCanvas* canvas,
-              SkPicture::AbortCallback* callback) const override;
+  void Raster(PaintCanvas* canvas,
+              PaintRecord::AbortCallback* callback) const override;
   void AsValueInto(const gfx::Rect& visual_rect,
                    base::trace_event::TracedValue* array) const override;
 
@@ -55,8 +54,8 @@ class CC_EXPORT EndClipPathDisplayItem : public DisplayItem {
   }
 
   void ToProtobuf(proto::DisplayItem* proto) const override;
-  void Raster(SkCanvas* canvas,
-              SkPicture::AbortCallback* callback) const override;
+  void Raster(PaintCanvas* canvas,
+              PaintRecord::AbortCallback* callback) const override;
   void AsValueInto(const gfx::Rect& visual_rect,
                    base::trace_event::TracedValue* array) const override;