cc: Clean up RecordingSource API

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/playback/recording_source.h"
+#include "cc/layers/picture_layer.h"
 #include "skia/ext/analysis_canvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace cc {
 class DisplayItemList;
 class DrawImage;
 class ImageDecodeController;
 
 class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
  public:
   struct CC_EXPORT PlaybackSettings {
     PlaybackSettings();
 
     // If set to true, this indicates that the canvas has already been
     // rasterized into. This means that the canvas cannot be cleared safely.
     bool playback_to_shared_canvas;
 
     // If set to true, none of the images will be rasterized.
     bool skip_images;
 
     // 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,
+  static scoped_refptr<RasterSource> CreateFromDataStruct(
+      const PictureLayerData& layer_data,
+      const ContentLayerClientData& client_data,
       bool can_use_lcd_text);
 
   // TODO(trchen): Deprecated.
   void PlaybackToCanvas(SkCanvas* 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
@@ skipping 60 matching lines @@
 
   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 SetImageDecodeController(ImageDecodeController* image_decode_controller);
 
  protected:
   friend class base::RefCountedThreadSafe<RasterSource>;
 
-  RasterSource(const RecordingSource* other, bool can_use_lcd_text);
+  RasterSource(const PictureLayerData& layer_data,
+               const ContentLayerClientData& client_data,
+               bool can_use_lcd_text);
   RasterSource(const RasterSource* other, bool can_use_lcd_text);
   virtual ~RasterSource();
 
   // These members are const as this raster source may be in use on another
   // thread and so should not be touched after construction.
   const scoped_refptr<DisplayItemList> display_list_;
   const size_t painter_reported_memory_usage_;
   const SkColor background_color_;
   const bool requires_clear_;
   const bool can_use_lcd_text_;
@@ skipping 15 matching lines @@
   void RasterCommon(SkCanvas* canvas, SkPicture::AbortCallback* callback) const;
 
   void PrepareForPlaybackToCanvas(SkCanvas* canvas) const;
 
   DISALLOW_COPY_AND_ASSIGN(RasterSource);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_RASTER_SOURCE_H_