Rename paint data structures

cc/playback/compositing_display_item.h

Index: cc/playback/compositing_display_item.h
diff --git a/cc/playback/compositing_display_item.h b/cc/playback/compositing_display_item.h
index d562e5ed28879e40fe90535e1d5c96aad63521c0..08e461e7ca51338b077f7f44369be471b5cc8f3e 100644
--- a/cc/playback/compositing_display_item.h
+++ b/cc/playback/compositing_display_item.h
@@ -12,14 +12,14 @@
 
 #include "base/memory/ptr_util.h"
 #include "cc/base/cc_export.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_record.h"
 #include "cc/playback/display_item.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "ui/gfx/geometry/rect_f.h"
 
-class SkCanvas;
-
 namespace cc {
 
 class CC_EXPORT CompositingDisplayItem : public DisplayItem {
@@ -31,8 +31,8 @@ class CC_EXPORT CompositingDisplayItem : public DisplayItem {
                          bool lcd_text_requires_opaque_layer);
   ~CompositingDisplayItem() 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;
 
@@ -66,8 +66,8 @@ class CC_EXPORT EndCompositingDisplayItem : public DisplayItem {
     return base::MakeUnique<EndCompositingDisplayItem>();
   }
 
-  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;