Rename paint data structures

cc/playback/transform_display_item.h

Index: cc/playback/transform_display_item.h
diff --git a/cc/playback/transform_display_item.h b/cc/playback/transform_display_item.h
index 75ef6da852ad20ab57a460bee5367d29d9f979f7..4acf5bfba22a0147795b4263a7b87ea5f225d5e4 100644
--- a/cc/playback/transform_display_item.h
+++ b/cc/playback/transform_display_item.h
@@ -14,8 +14,6 @@
 #include "cc/playback/display_item.h"
 #include "ui/gfx/transform.h"
 
-class SkCanvas;
-
 namespace cc {
 
 class CC_EXPORT TransformDisplayItem : public DisplayItem {
@@ -23,8 +21,8 @@ class CC_EXPORT TransformDisplayItem : public DisplayItem {
   explicit TransformDisplayItem(const gfx::Transform& transform);
   ~TransformDisplayItem() 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;
 
@@ -46,8 +44,8 @@ class CC_EXPORT EndTransformDisplayItem : public DisplayItem {
     return base::MakeUnique<EndTransformDisplayItem>();
   }
 
-  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;