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 499d05bb53a4bc4634e16e1bf2d890060a3724ac..6c2a1f97d967c6a624b8c9be85cd384e79735141 100644
--- a/cc/playback/filter_display_item.h
+++ b/cc/playback/filter_display_item.h
@@ -15,7 +15,7 @@
 #include "cc/playback/display_item.h"
 #include "ui/gfx/geometry/rect_f.h"
 
-class SkCanvas;
+class PaintCanvas;
 
 namespace cc {
 
@@ -28,8 +28,8 @@ class CC_EXPORT FilterDisplayItem : public DisplayItem {
   ~FilterDisplayItem() 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;
 
@@ -61,8 +61,8 @@ class CC_EXPORT EndFilterDisplayItem : public DisplayItem {
   }
 
   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;