cc: Clean up RecordingSource API

cc/playback/recording_source.h

Index: cc/playback/recording_source.h
diff --git a/cc/playback/recording_source.h b/cc/playback/recording_source.h
index 36d0511d358ab2662128f4768900e722e9170d83..cb9bdc0fc51e1ea7ad1b025c2a4044d770e56ed0 100644
--- a/cc/playback/recording_source.h
+++ b/cc/playback/recording_source.h
@@ -48,14 +48,15 @@ class CC_EXPORT RecordingSource {
 
   void ToProtobuf(proto::RecordingSource* proto) const;
   void FromProtobuf(const proto::RecordingSource& proto,
-                    ClientPictureCache* client_picture_cache,
-                    std::vector<uint32_t>* used_engine_picture_ids);
-
-  bool UpdateAndExpandInvalidation(ContentLayerClient* painter,
-                                   Region* invalidation,
-                                   const gfx::Size& layer_size,
-                                   int frame_number,
-                                   RecordingMode recording_mode);
+                    const scoped_refptr<DisplayItemList>& display_list);
+
+  bool UpdateAndExpandInvalidation(
+      ContentLayerClient* painter,
+      Region* invalidation,
+      const gfx::Size& layer_size,
+      const gfx::Rect& old_recorded_viewport,
+      const gfx::Rect& new_recorded_viewport,
+      const scoped_refptr<DisplayItemList>& display_list);
   gfx::Size GetSize() const;
   void SetEmptyBounds();
   void SetSlowdownRasterScaleFactor(int factor);
@@ -67,17 +68,12 @@ class CC_EXPORT RecordingSource {
 
   // These functions are virtual for testing.
   virtual scoped_refptr<RasterSource> CreateRasterSource(
-      bool can_use_lcd_text) const;
-  virtual bool IsSuitableForGpuRasterization() const;
-
-  gfx::Rect recorded_viewport() const { return recorded_viewport_; }
-
-  const DisplayItemList* GetDisplayItemList();
+      bool can_use_lcd_text,
+      const gfx::Rect& recorded_viewport,
+      const scoped_refptr<DisplayItemList>& display_list,
+      const size_t& painter_reported_memory_usage) const;
 
  protected:
-  void Clear();
-
-  gfx::Rect recorded_viewport_;
   gfx::Size size_;
   int slow_down_raster_scale_factor_for_debug_;
   bool generate_discardable_images_metadata_;
@@ -87,18 +83,18 @@ class CC_EXPORT RecordingSource {
   SkColor solid_color_;
   SkColor background_color_;
 
-  scoped_refptr<DisplayItemList> display_list_;
-  size_t painter_reported_memory_usage_;
-
  private:
   void UpdateInvalidationForNewViewport(const gfx::Rect& old_recorded_viewport,
                                         const gfx::Rect& new_recorded_viewport,
                                         Region* invalidation);
-  void FinishDisplayItemListUpdate();
+
+  void FinishDisplayItemListUpdate(
+      const scoped_refptr<DisplayItemList>& display_list);
 
   friend class RasterSource;
 
-  void DetermineIfSolidColor();
+  void DetermineIfSolidColor(
+      const scoped_refptr<DisplayItemList>& display_list);
 
   InvalidationRegion invalidation_;