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 f736b02314845aeeab674221369bc4d54adb1144..5ba6377a405f0faf35e8e89559775049c95f3c44 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 {
@@ -23,8 +22,8 @@ class CC_EXPORT ClipPathDisplayItem : public DisplayItem {
   ClipPathDisplayItem(const SkPath& path, bool antialias);
   ~ClipPathDisplayItem() 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;
 
@@ -51,8 +50,8 @@ class CC_EXPORT EndClipPathDisplayItem : public DisplayItem {
     return base::MakeUnique<EndClipPathDisplayItem>();
   }
 
-  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;