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 a495d9a82f4dbcf6dc28d816a9e2316895e3cbda..44b5da8b82e1406949bf73ae82eb76c70f525579 100644
--- a/cc/playback/transform_display_item.cc
+++ b/cc/playback/transform_display_item.cc
@@ -10,7 +10,6 @@
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/proto/display_item.pb.h"
 #include "cc/proto/gfx_conversions.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 
 namespace cc {
 
@@ -43,8 +42,8 @@ void TransformDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   TransformToProto(transform_, details->mutable_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());
@@ -75,8 +74,8 @@ void EndTransformDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
 }
 
 void EndTransformDisplayItem::Raster(
-    SkCanvas* canvas,
-    SkPicture::AbortCallback* callback) const {
+    PaintCanvas* canvas,
+    PaintRecord::AbortCallback* callback) const {
   canvas->restore();
 }