Rename paint data structures

cc/playback/float_clip_display_item.cc

Index: cc/playback/float_clip_display_item.cc
diff --git a/cc/playback/float_clip_display_item.cc b/cc/playback/float_clip_display_item.cc
index 648bb0a315f0febd70ea797b4365f207c860e51b..4dcc4695125b27346cf1e5c61f989cfb82a0080e 100644
--- a/cc/playback/float_clip_display_item.cc
+++ b/cc/playback/float_clip_display_item.cc
@@ -8,7 +8,6 @@
 
 #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 {
@@ -25,8 +24,8 @@ void FloatClipDisplayItem::SetNew(const gfx::RectF& clip_rect) {
   clip_rect_ = clip_rect;
 }
 
-void FloatClipDisplayItem::Raster(SkCanvas* canvas,
-                                  SkPicture::AbortCallback* callback) const {
+void FloatClipDisplayItem::Raster(PaintCanvas* canvas,
+                                  PaintRecord::AbortCallback* callback) const {
   canvas->save();
   canvas->clipRect(gfx::RectFToSkRect(clip_rect_));
 }
@@ -46,8 +45,8 @@ EndFloatClipDisplayItem::~EndFloatClipDisplayItem() {
 }
 
 void EndFloatClipDisplayItem::Raster(
-    SkCanvas* canvas,
-    SkPicture::AbortCallback* callback) const {
+    PaintCanvas* canvas,
+    PaintRecord::AbortCallback* callback) const {
   canvas->restore();
 }