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 def09c9c225be1f7ce0a4c91a9f6b53494c14f2f..00abd06e6dac0665d1e26d92a15dacc7ef75a3e5 100644
--- a/cc/playback/float_clip_display_item.cc
+++ b/cc/playback/float_clip_display_item.cc
@@ -10,7 +10,6 @@
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/proto/display_item.pb.h"
 #include "cc/proto/gfx_conversions.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
@@ -44,8 +43,8 @@ void FloatClipDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   RectFToProto(clip_rect_, details->mutable_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_));
 }
@@ -75,8 +74,8 @@ void EndFloatClipDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
 }
 
 void EndFloatClipDisplayItem::Raster(
-    SkCanvas* canvas,
-    SkPicture::AbortCallback* callback) const {
+    PaintCanvas* canvas,
+    PaintRecord::AbortCallback* callback) const {
   canvas->restore();
 }