Rename paint data structures

cc/playback/clip_display_item.cc

Index: cc/playback/clip_display_item.cc
diff --git a/cc/playback/clip_display_item.cc b/cc/playback/clip_display_item.cc
index 0d7b801174859c5f916de55d1bb8773360b2df51..1ad2c534273028cf674047a33aeac55e73ddffeb 100644
--- a/cc/playback/clip_display_item.cc
+++ b/cc/playback/clip_display_item.cc
@@ -14,7 +14,6 @@
 #include "cc/proto/display_item.pb.h"
 #include "cc/proto/gfx_conversions.h"
 #include "cc/proto/skia_conversions.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
@@ -64,8 +63,8 @@ void ClipDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   details->set_antialias(antialias_);
 }
 
-void ClipDisplayItem::Raster(SkCanvas* canvas,
-                             SkPicture::AbortCallback* callback) const {
+void ClipDisplayItem::Raster(PaintCanvas* canvas,
+                             PaintRecord::AbortCallback* callback) const {
   canvas->save();
   canvas->clipRect(gfx::RectToSkRect(clip_rect_), antialias_);
   for (size_t i = 0; i < rounded_clip_rects_.size(); ++i) {
@@ -119,8 +118,8 @@ void EndClipDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   proto->set_type(proto::DisplayItem::Type_EndClip);
 }
 
-void EndClipDisplayItem::Raster(SkCanvas* canvas,
-                                SkPicture::AbortCallback* callback) const {
+void EndClipDisplayItem::Raster(PaintCanvas* canvas,
+                                PaintRecord::AbortCallback* callback) const {
   canvas->restore();
 }