Rename paint data structures

cc/playback/raster_source.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_PLAYBACK_RASTER_SOURCE_H_
 #define CC_PLAYBACK_RASTER_SOURCE_H_
 
 #include <stddef.h>
 
 #include <memory>
 #include <vector>
 
 #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;
 }
 
 namespace cc {
 class DisplayItemList;
 class DrawImage;
 class ImageDecodeCache;
 
@@ skipping 12 matching lines @@
     // If set to true, we will use an image hijack canvas, which enables
     // compositor image caching.
     bool use_image_hijack_canvas;
   };
 
   static scoped_refptr<RasterSource> CreateFromRecordingSource(
       const RecordingSource* other,
       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,
                         const PlaybackSettings& settings) const;
 
   // Raster this RasterSource into the given canvas. Canvas states such as
   // CTM and clip region will be respected. This function will replace pixels
   // in the clip region without blending. It is assumed that existing pixels
   // may be uninitialized and will be cleared before playback.
   //
   // Virtual for testing.
   //
   // 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
   // this raster source, as well as the solid color value.
   bool PerformSolidColorAnalysis(const gfx::Rect& content_rect,
                                  float contents_scale,
                                  SkColor* color) const;
 
   // Returns true iff the whole raster source is of solid color.
   bool IsSolidColor() const;
@@ skipping 26 matching lines @@
 
   // Returns true if this raster source has anything to rasterize.
   virtual bool HasRecordings() const;
 
   // Valid rectangle in which everything is recorded and can be rastered from.
   virtual gfx::Rect RecordedViewport() const;
 
   // 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.
   virtual bool CanUseLCDText() const;
 
   scoped_refptr<RasterSource> CreateCloneWithoutLCDText() const;
 
   // Image decode controller should be set once. Its lifetime has to exceed that
   // of the raster source, since the raster source will access it during raster.
   void set_image_decode_cache(ImageDecodeCache* image_decode_cache) {
@@ skipping 20 matching lines @@
   const gfx::Rect recorded_viewport_;
   const gfx::Size size_;
   const bool clear_canvas_with_debug_color_;
   const int slow_down_raster_scale_factor_for_debug_;
 
   // In practice, this is only set once before raster begins, so it's ok with
   // respect to threading.
   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);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_RASTER_SOURCE_H_