Rename paint data structures

cc/playback/raster_source.h

Index: cc/playback/raster_source.h
diff --git a/cc/playback/raster_source.h b/cc/playback/raster_source.h
index 471f7ba6ee479e616621729cf55bee52c1c6b1a4..6c9cf92f28f2442df44a99ef49e35d9d6197e72e 100644
--- a/cc/playback/raster_source.h
+++ b/cc/playback/raster_source.h
@@ -13,9 +13,10 @@
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_record.h"
 #include "cc/playback/recording_source.h"
 #include "skia/ext/analysis_canvas.h"
-#include "third_party/skia/include/core/SkPicture.h"
 
 namespace gfx {
 class ColorSpace;
@@ -48,7 +49,7 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
       bool can_use_lcd_text);
 
   // TODO(trchen): Deprecated.
-  void PlaybackToCanvas(SkCanvas* canvas,
+  void PlaybackToCanvas(PaintCanvas* canvas,
                         const gfx::Rect& canvas_bitmap_rect,
                         const gfx::Rect& canvas_playback_rect,
                         float contents_scale,
@@ -63,7 +64,7 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
   //
   // Note that this should only be called after the image decode controller has
   // been set, which happens during commit.
-  virtual void PlaybackToCanvas(SkCanvas* canvas,
+  virtual void PlaybackToCanvas(PaintCanvas* canvas,
                                 const PlaybackSettings& settings) const;
 
   // Returns whether the given rect at given scale is of solid color in
@@ -110,7 +111,7 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
   // Tracing functionality.
   virtual void DidBeginTracing();
   virtual void AsValueInto(base::trace_event::TracedValue* array) const;
-  virtual sk_sp<SkPicture> GetFlattenedPicture();
+  virtual sk_sp<PaintRecord> GetFlattenedPicture();
   virtual size_t GetPictureMemoryUsage() const;
 
   // Return true if LCD anti-aliasing may be used when rastering text.
@@ -151,9 +152,10 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
   ImageDecodeCache* image_decode_cache_;
 
  private:
-  void RasterCommon(SkCanvas* canvas, SkPicture::AbortCallback* callback) const;
+  void RasterCommon(PaintCanvas* canvas,
+                    PaintRecord::AbortCallback* callback) const;
 
-  void PrepareForPlaybackToCanvas(SkCanvas* canvas) const;
+  void PrepareForPlaybackToCanvas(PaintCanvas* canvas) const;
 
   DISALLOW_COPY_AND_ASSIGN(RasterSource);
 };