cc: Clean up RecordingSource API

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 c50c4a0f626a4bdf2e38864d3d910ccf65822b0e..63edd55696cf6065230adcceefcd7c7f3dbf3e75 100644
--- a/cc/playback/raster_source.h
+++ b/cc/playback/raster_source.h
@@ -13,7 +13,7 @@
 #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"
 
@@ -39,8 +39,9 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
     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.
@@ -121,7 +122,9 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
  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();