Rename paint data structures

cc/playback/raster_source.cc

Index: cc/playback/raster_source.cc
diff --git a/cc/playback/raster_source.cc b/cc/playback/raster_source.cc
index 031cd30acdf2c3ce08e264305de77a60b03c63bc..1abe9a4d963f994fd0d79eacbca641f8b469f84b 100644
--- a/cc/playback/raster_source.cc
+++ b/cc/playback/raster_source.cc
@@ -10,13 +10,11 @@
 #include "cc/base/math_util.h"
 #include "cc/base/region.h"
 #include "cc/debug/debug_colors.h"
+#include "cc/paint/paint_recorder.h"
 #include "cc/playback/display_item_list.h"
 #include "cc/playback/image_hijack_canvas.h"
 #include "cc/playback/skip_image_canvas.h"
 #include "skia/ext/analysis_canvas.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkClipStack.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 
 namespace cc {
@@ -60,7 +58,7 @@ RasterSource::RasterSource(const RasterSource* other, bool can_use_lcd_text)
 RasterSource::~RasterSource() {
 }
 
-void RasterSource::PlaybackToCanvas(SkCanvas* raster_canvas,
+void RasterSource::PlaybackToCanvas(PaintCanvas* raster_canvas,
                                     const gfx::Rect& canvas_bitmap_rect,
                                     const gfx::Rect& canvas_playback_rect,
                                     float raster_scale,
@@ -80,7 +78,7 @@ void RasterSource::PlaybackToCanvas(SkCanvas* raster_canvas,
   raster_canvas->restore();
 }
 
-void RasterSource::PlaybackToCanvas(SkCanvas* raster_canvas,
+void RasterSource::PlaybackToCanvas(PaintCanvas* raster_canvas,
                                     const PlaybackSettings& settings) const {
   if (!settings.playback_to_shared_canvas)
     PrepareForPlaybackToCanvas(raster_canvas);
@@ -110,7 +108,7 @@ void RasterSource::PlaybackToCanvas(SkCanvas* raster_canvas,
 
 namespace {
 
-bool CanvasIsUnclipped(const SkCanvas* canvas) {
+bool CanvasIsUnclipped(const PaintCanvas* canvas) {
   if (!canvas->isClipRect())
     return false;
 
@@ -124,7 +122,7 @@ bool CanvasIsUnclipped(const SkCanvas* canvas) {
 
 }  // namespace
 
-void RasterSource::PrepareForPlaybackToCanvas(SkCanvas* canvas) const {
+void RasterSource::PrepareForPlaybackToCanvas(PaintCanvas* canvas) const {
   // TODO(hendrikw): See if we can split this up into separate functions.
 
   if (CanvasIsUnclipped(canvas))
@@ -200,19 +198,19 @@ void RasterSource::PrepareForPlaybackToCanvas(SkCanvas* canvas) const {
   canvas->restore();
 }
 
-void RasterSource::RasterCommon(SkCanvas* canvas,
-                                SkPicture::AbortCallback* callback) const {
+void RasterSource::RasterCommon(PaintCanvas* canvas,
+                                PaintRecord::AbortCallback* callback) const {
   DCHECK(display_list_.get());
   int repeat_count = std::max(1, slow_down_raster_scale_factor_for_debug_);
   for (int i = 0; i < repeat_count; ++i)
     display_list_->Raster(canvas, callback);
 }
 
-sk_sp<SkPicture> RasterSource::GetFlattenedPicture() {
+sk_sp<PaintRecord> RasterSource::GetFlattenedPicture() {
   TRACE_EVENT0("cc", "RasterSource::GetFlattenedPicture");
 
-  SkPictureRecorder recorder;
-  SkCanvas* canvas = recorder.beginRecording(size_.width(), size_.height());
+  PaintRecorder recorder;
+  PaintCanvas* canvas = recorder.beginRecording(size_.width(), size_.height());
   if (!size_.IsEmpty()) {
     PrepareForPlaybackToCanvas(canvas);
     RasterCommon(canvas, nullptr);