cc: Clean up RecordingSource API

cc/playback/recording_source.cc

Index: cc/playback/recording_source.cc
diff --git a/cc/playback/recording_source.cc b/cc/playback/recording_source.cc
index 9806e9ed380d751bb028abbae86074809da8d615..96a22d49d1d2a93cef6ff234d56870085e69fc3a 100644
--- a/cc/playback/recording_source.cc
+++ b/cc/playback/recording_source.cc
@@ -36,13 +36,11 @@ RecordingSource::RecordingSource()
       is_solid_color_(false),
       clear_canvas_with_debug_color_(kDefaultClearCanvasSetting),
       solid_color_(SK_ColorTRANSPARENT),
-      background_color_(SK_ColorTRANSPARENT),
-      painter_reported_memory_usage_(0) {}
+      background_color_(SK_ColorTRANSPARENT) {}
 
 RecordingSource::~RecordingSource() {}
 
 void RecordingSource::ToProtobuf(proto::RecordingSource* proto) const {
-  RectToProto(recorded_viewport_, proto->mutable_recorded_viewport());
   SizeToProto(size_, proto->mutable_size());
   proto->set_slow_down_raster_scale_factor_for_debug(
       slow_down_raster_scale_factor_for_debug_);
@@ -53,16 +51,11 @@ void RecordingSource::ToProtobuf(proto::RecordingSource* proto) const {
   proto->set_clear_canvas_with_debug_color(clear_canvas_with_debug_color_);
   proto->set_solid_color(static_cast<uint64_t>(solid_color_));
   proto->set_background_color(static_cast<uint64_t>(background_color_));
-  if (display_list_)
-    display_list_->ToProtobuf(proto->mutable_display_list());
 }
 
 void RecordingSource::FromProtobuf(
     const proto::RecordingSource& proto,
-    ClientPictureCache* client_picture_cache,
-    std::vector<uint32_t>* used_engine_picture_ids) {
-  DCHECK(client_picture_cache);
-  recorded_viewport_ = ProtoToRect(proto.recorded_viewport());
+    const scoped_refptr<DisplayItemList>& display_list) {
   size_ = ProtoToSize(proto.size());
   slow_down_raster_scale_factor_for_debug_ =
       proto.slow_down_raster_scale_factor_for_debug();
@@ -74,15 +67,8 @@ void RecordingSource::FromProtobuf(
   solid_color_ = static_cast<SkColor>(proto.solid_color());
   background_color_ = static_cast<SkColor>(proto.background_color());
 
-  // This might not exist if the |display_list_| of the serialized
-  // RecordingSource was null, wich can happen if |Clear()| is
-  // called.
-  if (proto.has_display_list()) {
-    display_list_ = DisplayItemList::CreateFromProto(
-        proto.display_list(), client_picture_cache, used_engine_picture_ids);
-    FinishDisplayItemListUpdate();
-  } else {
-    display_list_ = nullptr;
+  if (display_list) {
+    FinishDisplayItemListUpdate(display_list);
   }
 }
 
@@ -100,12 +86,13 @@ void RecordingSource::UpdateInvalidationForNewViewport(
   invalidation->Union(no_longer_exposed_region);
 }
 
-void RecordingSource::FinishDisplayItemListUpdate() {
+void RecordingSource::FinishDisplayItemListUpdate(
+    const scoped_refptr<DisplayItemList>& display_list) {
   TRACE_EVENT0("cc", "RecordingSource::FinishDisplayItemListUpdate");
-  DetermineIfSolidColor();
-  display_list_->EmitTraceSnapshot();
+  DetermineIfSolidColor(display_list);
+  display_list->EmitTraceSnapshot();
   if (generate_discardable_images_metadata_)
-    display_list_->GenerateDiscardableImagesMetadata();
+    display_list->GenerateDiscardableImagesMetadata();
 }
 
 void RecordingSource::SetNeedsDisplayRect(const gfx::Rect& layer_rect) {
@@ -119,8 +106,9 @@ bool RecordingSource::UpdateAndExpandInvalidation(
     ContentLayerClient* painter,
     Region* invalidation,
     const gfx::Size& layer_size,
-    int frame_number,
-    RecordingMode recording_mode) {
+    const gfx::Rect& old_recorded_viewport,
+    const gfx::Rect& new_recorded_viewport,
+    const scoped_refptr<DisplayItemList>& display_list) {
   bool updated = false;
 
   if (size_ != layer_size)
@@ -129,50 +117,19 @@ bool RecordingSource::UpdateAndExpandInvalidation(
   invalidation_.Swap(invalidation);
   invalidation_.Clear();
 
-  gfx::Rect new_recorded_viewport = painter->PaintableRegion();
-  if (new_recorded_viewport != recorded_viewport_) {
-    UpdateInvalidationForNewViewport(recorded_viewport_, new_recorded_viewport,
-                                     invalidation);
-    recorded_viewport_ = new_recorded_viewport;
+  if (new_recorded_viewport != old_recorded_viewport) {
+    UpdateInvalidationForNewViewport(old_recorded_viewport,
+                                     new_recorded_viewport, invalidation);
     updated = true;
   }
 
-  if (!updated && !invalidation->Intersects(recorded_viewport_))
+  if (!updated && !invalidation->Intersects(new_recorded_viewport))
     return false;
 
   if (invalidation->IsEmpty())
     return false;
 
-  ContentLayerClient::PaintingControlSetting painting_control =
-      ContentLayerClient::PAINTING_BEHAVIOR_NORMAL;
-
-  switch (recording_mode) {
-    case RECORD_NORMALLY:
-      // Already setup for normal recording.
-      break;
-    case RECORD_WITH_PAINTING_DISABLED:
-      painting_control = ContentLayerClient::DISPLAY_LIST_PAINTING_DISABLED;
-      break;
-    case RECORD_WITH_CACHING_DISABLED:
-      painting_control = ContentLayerClient::DISPLAY_LIST_CACHING_DISABLED;
-      break;
-    case RECORD_WITH_CONSTRUCTION_DISABLED:
-      painting_control = ContentLayerClient::DISPLAY_LIST_CONSTRUCTION_DISABLED;
-      break;
-    case RECORD_WITH_SUBSEQUENCE_CACHING_DISABLED:
-      painting_control = ContentLayerClient::SUBSEQUENCE_CACHING_DISABLED;
-      break;
-    case RECORD_WITH_SK_NULL_CANVAS:
-    case RECORDING_MODE_COUNT:
-      NOTREACHED();
-  }
-
-  // TODO(vmpstr): Add a slow_down_recording_scale_factor_for_debug_ to be able
-  // to slow down recording.
-  display_list_ = painter->PaintContentsToDisplayList(painting_control);
-  painter_reported_memory_usage_ = painter->GetApproximateUnsharedMemoryUsage();
-
-  FinishDisplayItemListUpdate();
+  FinishDisplayItemListUpdate(display_list);
 
   return true;
 }
@@ -183,7 +140,7 @@ gfx::Size RecordingSource::GetSize() const {
 
 void RecordingSource::SetEmptyBounds() {
   size_ = gfx::Size();
-  Clear();
+  is_solid_color_ = false;
 }
 
 void RecordingSource::SetSlowdownRasterScaleFactor(int factor) {
@@ -203,45 +160,31 @@ void RecordingSource::SetRequiresClear(bool requires_clear) {
   requires_clear_ = requires_clear;
 }
 
-bool RecordingSource::IsSuitableForGpuRasterization() const {
-  // The display list needs to be created (see: UpdateAndExpandInvalidation)
-  // before checking for suitability. There are cases where an update will not
-  // create a display list (e.g., if the size is empty). We return true in these
-  // cases because the gpu suitability bit sticks false.
-  return !display_list_ || display_list_->IsSuitableForGpuRasterization();
-}
-
-const DisplayItemList* RecordingSource::GetDisplayItemList() {
-  return display_list_.get();
-}
-
 scoped_refptr<RasterSource> RecordingSource::CreateRasterSource(
-    bool can_use_lcd_text) const {
-  return scoped_refptr<RasterSource>(
-      RasterSource::CreateFromRecordingSource(this, can_use_lcd_text));
-}
-
-void RecordingSource::DetermineIfSolidColor() {
-  DCHECK(display_list_);
+    bool can_use_lcd_text,
+    const gfx::Rect& recorded_viewport,
+    const scoped_refptr<DisplayItemList>& display_list,
+    const size_t& painter_reported_memory_usage) const {
+  return scoped_refptr<RasterSource>(RasterSource::CreateFromRecordingSource(
+      this, can_use_lcd_text, recorded_viewport, display_list,
+      painter_reported_memory_usage));
+}
+
+void RecordingSource::DetermineIfSolidColor(
+    const scoped_refptr<DisplayItemList>& display_list) {
+  DCHECK(display_list);
   is_solid_color_ = false;
   solid_color_ = SK_ColorTRANSPARENT;
 
-  if (!display_list_->ShouldBeAnalyzedForSolidColor())
+  if (!display_list->ShouldBeAnalyzedForSolidColor())
     return;
 
   TRACE_EVENT1("cc", "RecordingSource::DetermineIfSolidColor", "opcount",
-               display_list_->ApproximateOpCount());
+               display_list->ApproximateOpCount());
   gfx::Size layer_size = GetSize();
   skia::AnalysisCanvas canvas(layer_size.width(), layer_size.height());
-  display_list_->Raster(&canvas, nullptr, gfx::Rect(), 1.f);
+  display_list->Raster(&canvas, nullptr, gfx::Rect(), 1.f);
   is_solid_color_ = canvas.GetColorIfSolid(&solid_color_);
 }
 
-void RecordingSource::Clear() {
-  recorded_viewport_ = gfx::Rect();
-  display_list_ = nullptr;
-  painter_reported_memory_usage_ = 0;
-  is_solid_color_ = false;
-}
-
 }  // namespace cc