Rename paint data structures

cc/playback/clip_path_display_item.cc

Index: cc/playback/clip_path_display_item.cc
diff --git a/cc/playback/clip_path_display_item.cc b/cc/playback/clip_path_display_item.cc
index 5d18b3b7aec15845589927c09d6c2753f934c803..b472caaa74910940669bb6cc96c429ae9718b144 100644
--- a/cc/playback/clip_path_display_item.cc
+++ b/cc/playback/clip_path_display_item.cc
@@ -11,7 +11,6 @@
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/proto/display_item.pb.h"
 #include "cc/proto/skia_conversions.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 
 namespace cc {
 
@@ -62,8 +61,8 @@ void ClipPathDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   }
 }
 
-void ClipPathDisplayItem::Raster(SkCanvas* canvas,
-                                 SkPicture::AbortCallback* callback) const {
+void ClipPathDisplayItem::Raster(PaintCanvas* canvas,
+                                 PaintRecord::AbortCallback* callback) const {
   canvas->save();
   canvas->clipPath(clip_path_, antialias_);
 }
@@ -91,8 +90,8 @@ void EndClipPathDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
 }
 
 void EndClipPathDisplayItem::Raster(
-    SkCanvas* canvas,
-    SkPicture::AbortCallback* callback) const {
+    PaintCanvas* canvas,
+    PaintRecord::AbortCallback* callback) const {
   canvas->restore();
 }