Rename paint data structures

cc/playback/clip_display_item.h

Index: cc/playback/clip_display_item.h
diff --git a/cc/playback/clip_display_item.h b/cc/playback/clip_display_item.h
index cd5c3b65f3133ee004ab3dfa3ed69676d1ff07e6..0a28208796336d220a497c937d5894ac65325b6b 100644
--- a/cc/playback/clip_display_item.h
+++ b/cc/playback/clip_display_item.h
@@ -11,12 +11,11 @@
 #include <vector>
 
 #include "cc/base/cc_export.h"
+#include "cc/paint/paint_canvas.h"
 #include "cc/playback/display_item.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "ui/gfx/geometry/rect.h"
 
-class SkCanvas;
-
 namespace cc {
 
 class CC_EXPORT ClipDisplayItem : public DisplayItem {
@@ -28,8 +27,8 @@ class CC_EXPORT ClipDisplayItem : public DisplayItem {
   ~ClipDisplayItem() 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 EndClipDisplayItem : public DisplayItem {
   ~EndClipDisplayItem() 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;