Rename paint data structures

cc/playback/float_clip_display_item.h

Index: cc/playback/float_clip_display_item.h
diff --git a/cc/playback/float_clip_display_item.h b/cc/playback/float_clip_display_item.h
index 6233d3cebce044145c296b7b0f336aaea3539be7..6e582297d22292bec9f4c5e2181b2855f9775560 100644
--- a/cc/playback/float_clip_display_item.h
+++ b/cc/playback/float_clip_display_item.h
@@ -15,8 +15,6 @@
 #include "cc/playback/display_item.h"
 #include "ui/gfx/geometry/rect_f.h"
 
-class SkCanvas;
-
 namespace cc {
 
 class CC_EXPORT FloatClipDisplayItem : public DisplayItem {
@@ -24,8 +22,8 @@ class CC_EXPORT FloatClipDisplayItem : public DisplayItem {
   explicit FloatClipDisplayItem(const gfx::RectF& clip_rect);
   ~FloatClipDisplayItem() 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;
 
@@ -47,8 +45,8 @@ class CC_EXPORT EndFloatClipDisplayItem : public DisplayItem {
     return base::MakeUnique<EndFloatClipDisplayItem>();
   }
 
-  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;