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 8ab86aeeaeb634ad0ffa382d9a50d08076fa09b2..8dfaa7c7c9b8dd37e4cb769bc75b2eca0ac2c0f8 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 {
@@ -26,8 +25,8 @@ class CC_EXPORT ClipDisplayItem : public DisplayItem {
                   bool antialias);
   ~ClipDisplayItem() 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 EndClipDisplayItem : public DisplayItem {
   EndClipDisplayItem();
   ~EndClipDisplayItem() 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;