Rename paint data structures

cc/playback/filter_display_item.h

Index: cc/playback/filter_display_item.h
diff --git a/cc/playback/filter_display_item.h b/cc/playback/filter_display_item.h
index 6cc77a0dccadec378344489538faeecd845007f8..56e496a87a6dbf79f12b81bf0b8a83c772ad17f9 100644
--- a/cc/playback/filter_display_item.h
+++ b/cc/playback/filter_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 FilterDisplayItem : public DisplayItem {
@@ -26,8 +24,8 @@ class CC_EXPORT FilterDisplayItem : public DisplayItem {
                     const gfx::PointF& origin);
   ~FilterDisplayItem() 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;
 
@@ -57,8 +55,8 @@ class CC_EXPORT EndFilterDisplayItem : public DisplayItem {
     return base::MakeUnique<EndFilterDisplayItem>();
   }
 
-  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;