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 c7bbcce7d28fb2b5e25671b63f00930b7a0887cb..5762ec6597c2efb19ab5e3895d9f39d75f2d62b0 100644
--- a/cc/playback/clip_path_display_item.cc
+++ b/cc/playback/clip_path_display_item.cc
@@ -9,7 +9,6 @@
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 
 namespace cc {
 
@@ -28,8 +27,8 @@ void ClipPathDisplayItem::SetNew(const SkPath& clip_path,
   antialias_ = antialias;
 }
 
-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_);
 }
@@ -48,8 +47,8 @@ EndClipPathDisplayItem::~EndClipPathDisplayItem() {
 }
 
 void EndClipPathDisplayItem::Raster(
-    SkCanvas* canvas,
-    SkPicture::AbortCallback* callback) const {
+    PaintCanvas* canvas,
+    PaintRecord::AbortCallback* callback) const {
   canvas->restore();
 }