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 4b4f0df4a23649be1849706a883c0a5a5e1e7ecd..5524dedd19f90abbf4d540ca2c89389697a2cc65 100644
--- a/cc/playback/clip_display_item.cc
+++ b/cc/playback/clip_display_item.cc
@@ -11,7 +11,6 @@
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
@@ -34,8 +33,8 @@ void ClipDisplayItem::SetNew(const gfx::Rect& clip_rect,
 
 ClipDisplayItem::~ClipDisplayItem() {}
 
-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) {
@@ -80,8 +79,8 @@ EndClipDisplayItem::EndClipDisplayItem() : DisplayItem(END_CLIP) {}
 EndClipDisplayItem::~EndClipDisplayItem() {
 }
 
-void EndClipDisplayItem::Raster(SkCanvas* canvas,
-                                SkPicture::AbortCallback* callback) const {
+void EndClipDisplayItem::Raster(PaintCanvas* canvas,
+                                PaintRecord::AbortCallback* callback) const {
   canvas->restore();
 }