cc: Clean up RecordingSource API

cc/layers/picture_layer.cc

 // Copyright 2012 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/layers/picture_layer.h"
 
 #include "base/auto_reset.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/playback/recording_source.h"
 #include "cc/proto/cc_conversions.h"
 #include "cc/proto/gfx_conversions.h"
 #include "cc/proto/layer.pb.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 
 namespace cc {
 
+PictureLayer::PictureLayerInputs::PictureLayerInputs() = default;
+
+PictureLayer::PictureLayerInputs::~PictureLayerInputs() = default;
+
 scoped_refptr<PictureLayer> PictureLayer::Create(ContentLayerClient* client) {
   return make_scoped_refptr(new PictureLayer(client));
 }
 
 PictureLayer::PictureLayer(ContentLayerClient* client)
     : instrumentation_object_tracker_(id()),
       update_source_frame_number_(-1),
       is_mask_(false) {
   picture_layer_inputs_.client = client;
 }
@@ skipping 71 matching lines @@
                "source_frame_number",
                layer_tree_host()->source_frame_number());
   devtools_instrumentation::ScopedLayerTreeTask update_layer(
       devtools_instrumentation::kUpdateLayer, id(), layer_tree_host()->id());
 
   // UpdateAndExpandInvalidation will give us an invalidation that covers
   // anything not explicitly recorded in this frame. We give this region
   // to the impl side so that it drops tiles that may not have a recording
   // for them.
   DCHECK(picture_layer_inputs_.client);
+
+  picture_layer_inputs_.recorded_viewport =
+      picture_layer_inputs_.client->PaintableRegion();
+
   updated |= recording_source_->UpdateAndExpandInvalidation(
       picture_layer_inputs_.client, &last_updated_invalidation_, layer_size,
-      update_source_frame_number_, RecordingSource::RECORD_NORMALLY);
+      picture_layer_inputs_.recorded_viewport);
 
   if (updated) {
+    picture_layer_inputs_.display_list =
+        picture_layer_inputs_.client->PaintContentsToDisplayList(
+            ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
+    picture_layer_inputs_.painter_reported_memory_usage =
+        picture_layer_inputs_.client->GetApproximateUnsharedMemoryUsage();
+    recording_source_->UpdateDisplayItemList(
+        picture_layer_inputs_.display_list,
+        picture_layer_inputs_.painter_reported_memory_usage);
     SetNeedsPushProperties();
   } else {
     // If this invalidation did not affect the recording source, then it can be
     // cleared as an optimization.
     last_updated_invalidation_.Clear();
   }
 
   return updated;
 }
 
 void PictureLayer::SetIsMask(bool is_mask) {
   is_mask_ = is_mask;
 }
 
 sk_sp<SkPicture> PictureLayer::GetPicture() const {
   // We could either flatten the RecordingSource into a single
   // SkPicture, or paint a fresh one depending on what we intend to do with the
   // picture. For now we just paint a fresh one to get consistent results.
   if (!DrawsContent())
     return nullptr;
 
   gfx::Size layer_size = bounds();
-  std::unique_ptr<RecordingSource> recording_source(new RecordingSource);
+  RecordingSource recording_source;
   Region recording_invalidation;
-  recording_source->UpdateAndExpandInvalidation(
+
+  gfx::Rect new_recorded_viewport =
+      picture_layer_inputs_.client->PaintableRegion();
+  scoped_refptr<DisplayItemList> display_list =
+      picture_layer_inputs_.client->PaintContentsToDisplayList(
+          ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
+  size_t painter_reported_memory_usage =
+      picture_layer_inputs_.client->GetApproximateUnsharedMemoryUsage();
+
+  recording_source.UpdateAndExpandInvalidation(
       picture_layer_inputs_.client, &recording_invalidation, layer_size,
-      update_source_frame_number_, RecordingSource::RECORD_NORMALLY);
+      new_recorded_viewport);
+  recording_source.UpdateDisplayItemList(display_list,
+                                         painter_reported_memory_usage);
 
   scoped_refptr<RasterSource> raster_source =
-      recording_source->CreateRasterSource(false);
+      recording_source.CreateRasterSource(false);
 
   return raster_source->GetFlattenedPicture();
 }
 
 bool PictureLayer::IsSuitableForGpuRasterization() const {
-  return recording_source_->IsSuitableForGpuRasterization();
+  // 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 !picture_layer_inputs_.display_list ||
+         picture_layer_inputs_.display_list->IsSuitableForGpuRasterization();
 }
 
 void PictureLayer::ClearClient() {
   picture_layer_inputs_.client = nullptr;
   UpdateDrawsContent(HasDrawableContent());
 }
 
 void PictureLayer::SetNearestNeighbor(bool nearest_neighbor) {
   if (picture_layer_inputs_.nearest_neighbor == nearest_neighbor)
     return;
@@ skipping 11 matching lines @@
 }
 
 void PictureLayer::LayerSpecificPropertiesToProto(
     proto::LayerProperties* proto) {
   Layer::LayerSpecificPropertiesToProto(proto);
   DropRecordingSourceContentIfInvalid();
 
   proto::PictureLayerProperties* picture = proto->mutable_picture();
   recording_source_->ToProtobuf(picture->mutable_recording_source());
 
-  // Add all SkPicture items to the picture cache.
-  const DisplayItemList* display_list = recording_source_->GetDisplayItemList();
-  if (display_list) {
-    for (auto it = display_list->begin(); it != display_list->end(); ++it) {
-      sk_sp<const SkPicture> picture = it->GetPicture();
+  RectToProto(picture_layer_inputs_.recorded_viewport,
+              picture->mutable_recorded_viewport());
+  if (picture_layer_inputs_.display_list) {
+    picture_layer_inputs_.display_list->ToProtobuf(
+        picture->mutable_display_list());
+    for (const auto& item : *picture_layer_inputs_.display_list) {
+      sk_sp<const SkPicture> picture = item.GetPicture();
       // Only DrawingDisplayItems have SkPictures.
       if (!picture)
         continue;
 
       layer_tree_host()->engine_picture_cache()->MarkUsed(picture.get());
     }
   }
 
   RegionToProto(last_updated_invalidation_, picture->mutable_invalidation());
   picture->set_is_mask(is_mask_);
   picture->set_nearest_neighbor(picture_layer_inputs_.nearest_neighbor);
 
   picture->set_update_source_frame_number(update_source_frame_number_);
 
   last_updated_invalidation_.Clear();
 }
 
 void PictureLayer::FromLayerSpecificPropertiesProto(
     const proto::LayerProperties& proto) {
   Layer::FromLayerSpecificPropertiesProto(proto);
   const proto::PictureLayerProperties& picture = proto.picture();
   // If this is a new layer, ensure it has a recording source. During layer
   // hierarchy deserialization, ::SetLayerTreeHost(...) is not called, but
   // instead the member is set directly, so it needs to be set here explicitly.
   if (!recording_source_)
     recording_source_.reset(new RecordingSource);
 
   std::vector<uint32_t> used_engine_picture_ids;
+
+  picture_layer_inputs_.recorded_viewport =
+      ProtoToRect(picture.recorded_viewport());
+
+  ClientPictureCache* client_picture_cache =
+      layer_tree_host()->client_picture_cache();
+  DCHECK(client_picture_cache);
+  // This might not exist if the |input_.display_list| of the serialized
+  // RecordingSource was null, which can happen if |Clear()| is
+  // called.
+  if (picture.has_display_list()) {
+    picture_layer_inputs_.display_list = DisplayItemList::CreateFromProto(
+        picture.display_list(), client_picture_cache, &used_engine_picture_ids);
+  } else {
+    picture_layer_inputs_.display_list = nullptr;
+  }
+
   recording_source_->FromProtobuf(picture.recording_source(),
-                                  layer_tree_host()->client_picture_cache(),
-                                  &used_engine_picture_ids);
+                                  picture_layer_inputs_.display_list);
 
   // Inform picture cache about which SkPictures are now in use.
   for (uint32_t engine_picture_id : used_engine_picture_ids)
     layer_tree_host()->client_picture_cache()->MarkUsed(engine_picture_id);
 
   Region new_invalidation = RegionFromProto(picture.invalidation());
   last_updated_invalidation_.Swap(&new_invalidation);
   is_mask_ = picture.is_mask();
   picture_layer_inputs_.nearest_neighbor = picture.nearest_neighbor();
 
@@ skipping 18 matching lines @@
          layer_bounds == recording_source_bounds)
       << " bounds " << layer_bounds.ToString() << " recording source "
       << recording_source_bounds.ToString();
 
   if (update_source_frame_number_ != source_frame_number &&
       recording_source_bounds != layer_bounds) {
     // Update may not get called for the layer (if it's not in the viewport
     // for example), even though it has resized making the recording source no
     // longer valid. In this case just destroy the recording source.
     recording_source_->SetEmptyBounds();
+    picture_layer_inputs_.recorded_viewport = gfx::Rect();
+    picture_layer_inputs_.display_list = nullptr;
+    picture_layer_inputs_.painter_reported_memory_usage = 0;
   }
 }
 
+const DisplayItemList* PictureLayer::GetDisplayItemList() {
+  return picture_layer_inputs_.display_list.get();
+}
+
 }  // namespace cc