Rename paint data structures

cc/playback/transform_display_item.cc

Index: cc/playback/transform_display_item.cc
diff --git a/cc/playback/transform_display_item.cc b/cc/playback/transform_display_item.cc
index 173170f731a98b62df17f75f2e022a00dfabd6ed..6a169ab2a85c292922e48621e01e7039c1b7e9f3 100644
--- a/cc/playback/transform_display_item.cc
+++ b/cc/playback/transform_display_item.cc
@@ -8,7 +8,6 @@
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 
 namespace cc {
 
@@ -24,8 +23,8 @@ void TransformDisplayItem::SetNew(const gfx::Transform& transform) {
   transform_ = transform;
 }
 
-void TransformDisplayItem::Raster(SkCanvas* canvas,
-                                  SkPicture::AbortCallback* callback) const {
+void TransformDisplayItem::Raster(PaintCanvas* canvas,
+                                  PaintRecord::AbortCallback* callback) const {
   canvas->save();
   if (!transform_.IsIdentity())
     canvas->concat(transform_.matrix());
@@ -46,8 +45,8 @@ EndTransformDisplayItem::~EndTransformDisplayItem() {
 }
 
 void EndTransformDisplayItem::Raster(
-    SkCanvas* canvas,
-    SkPicture::AbortCallback* callback) const {
+    PaintCanvas* canvas,
+    PaintRecord::AbortCallback* callback) const {
   canvas->restore();
 }