cc: Clean up RecordingSource API

cc/playback/recording_source.cc

 // 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.
 
 #include "cc/playback/recording_source.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 
@@ skipping 18 matching lines @@
 
 namespace cc {
 
 RecordingSource::RecordingSource()
     : slow_down_raster_scale_factor_for_debug_(0),
       generate_discardable_images_metadata_(false),
       requires_clear_(false),
       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_);
   proto->set_generate_discardable_images_metadata(
       generate_discardable_images_metadata_);
   proto->set_requires_clear(requires_clear_);
   proto->set_is_solid_color(is_solid_color_);
   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();
   generate_discardable_images_metadata_ =
       proto.generate_discardable_images_metadata();
   requires_clear_ = proto.requires_clear();
   is_solid_color_ = proto.is_solid_color();
   clear_canvas_with_debug_color_ = proto.clear_canvas_with_debug_color();
   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);
   }
+  display_list_ = display_list;
 }
 
 void RecordingSource::UpdateInvalidationForNewViewport(
     const gfx::Rect& old_recorded_viewport,
     const gfx::Rect& new_recorded_viewport,
     Region* invalidation) {
   // Invalidate newly-exposed and no-longer-exposed areas.
   Region newly_exposed_region(new_recorded_viewport);
   newly_exposed_region.Subtract(old_recorded_viewport);
   invalidation->Union(newly_exposed_region);
 
   Region no_longer_exposed_region(old_recorded_viewport);
   no_longer_exposed_region.Subtract(new_recorded_viewport);
   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) {
   if (!layer_rect.IsEmpty()) {
     // Clamp invalidation to the layer bounds.
     invalidation_.Union(gfx::IntersectRects(layer_rect, gfx::Rect(size_)));
   }
 }
 
 bool RecordingSource::UpdateAndExpandInvalidation(
     ContentLayerClient* painter,
     Region* invalidation,
     const gfx::Size& layer_size,
-    int frame_number,
-    RecordingMode recording_mode) {
+    const gfx::Rect& new_recorded_viewport,
+    const scoped_refptr<DisplayItemList>& display_list,
+    const size_t& painter_reported_memory_usage) {
   bool updated = false;
 
   if (size_ != layer_size)
     size_ = layer_size;
 
   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;
     updated = true;
   }
 
   if (!updated && !invalidation->Intersects(recorded_viewport_))
     return false;
 
   if (invalidation->IsEmpty())
     return false;
 
-  ContentLayerClient::PaintingControlSetting painting_control =
-      ContentLayerClient::PAINTING_BEHAVIOR_NORMAL;
+  FinishDisplayItemListUpdate(display_list);
 
-  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();
+  display_list_ = display_list;

[vmpstr, 2016/07/25 22:03:26]

We can set these earlier in the function right? That way we don't have to pass
display_list to FinishDisplayItemListUpdate or DetermineIfSolidcolor

[Menglin, 2016/07/26 17:49:41]

Done.

+  painter_reported_memory_usage_ = painter_reported_memory_usage;
 
   return true;
 }
 
 gfx::Size RecordingSource::GetSize() const {
   return size_;
 }
 
 void RecordingSource::SetEmptyBounds() {
   size_ = gfx::Size();
-  Clear();
+  is_solid_color_ = false;
+
+  recorded_viewport_ = gfx::Rect();
+  display_list_ = nullptr;
+  painter_reported_memory_usage_ = 0;
 }
 
 void RecordingSource::SetSlowdownRasterScaleFactor(int factor) {
   slow_down_raster_scale_factor_for_debug_ = factor;
 }
 
 void RecordingSource::SetGenerateDiscardableImagesMetadata(
     bool generate_metadata) {
   generate_discardable_images_metadata_ = generate_metadata;
 }
 
 void RecordingSource::SetBackgroundColor(SkColor background_color) {
   background_color_ = background_color;
 }
 
 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_);
+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