[blimp] Add SkPicture caching support.

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"
@@ skipping 19 matching lines @@
       is_mask_(false),
       nearest_neighbor_(false) {}
 
 PictureLayer::PictureLayer(ContentLayerClient* client,
                            std::unique_ptr<RecordingSource> source)
     : PictureLayer(client) {
   recording_source_ = std::move(source);
 }
 
 PictureLayer::~PictureLayer() {
+  // If there is a RecordingSource, it needs to be unregistered.
+  if (recording_source_)
+    recording_source_->MarkForUnregistration();
 }
 
 std::unique_ptr<LayerImpl> PictureLayer::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return PictureLayerImpl::Create(tree_impl, id(), is_mask_);
 }
 
 void PictureLayer::PushPropertiesTo(LayerImpl* base_layer) {
   Layer::PushPropertiesTo(base_layer);
   TRACE_EVENT0("cc", "PictureLayer::PushPropertiesTo");
   PictureLayerImpl* layer_impl = static_cast<PictureLayerImpl*>(base_layer);
   // TODO(danakj): Make is_mask_ a constructor parameter for PictureLayer.
   DCHECK_EQ(layer_impl->is_mask(), is_mask_);
   DropRecordingSourceContentIfInvalid();
 
   layer_impl->SetNearestNeighbor(nearest_neighbor_);
 
   // Preserve lcd text settings from the current raster source.
   bool can_use_lcd_text = layer_impl->RasterSourceUsesLCDText();
   scoped_refptr<RasterSource> raster_source =
       recording_source_->CreateRasterSource(can_use_lcd_text);
   layer_impl->set_gpu_raster_max_texture_size(
       layer_tree_host()->device_viewport_size());
   layer_impl->UpdateRasterSource(raster_source, &last_updated_invalidation_,
                                  nullptr);
   DCHECK(last_updated_invalidation_.IsEmpty());
 }
 
 void PictureLayer::SetLayerTreeHost(LayerTreeHost* host) {
+  LayerTreeHost* old_host = layer_tree_host();
   Layer::SetLayerTreeHost(host);
+  if (old_host == host)

[vmpstr, 2016/06/01 00:10:56]

When does this happen? Should this check be even higher?

[nyquist, 2016/06/04 00:24:57]

Removed now.

+    return;
+
+  if (old_host && recording_source_) {
+    // The LayerTreeHost has changed and there was already a recording source,
+    // so unregister everything in the RecordingSource.
+    recording_source_->MarkForUnregistration();

[vmpstr, 2016/06/01 00:10:56]

This feels wrong. 

[nyquist, 2016/06/04 00:24:57]

Removed this block.

+    recording_source_->set_engine_picture_cache(nullptr);
+    recording_source_->set_client_picture_cache(nullptr);
+  }
+
   if (!host)
     return;
 
   if (!recording_source_)
     recording_source_.reset(new RecordingSource);

[vmpstr, 2016/06/01 00:10:56]

This makes me believe that we can just do the Unmarking in the recording source
dtor. 

[nyquist, 2016/06/04 00:24:57]

Done.

+
+  // Ensure the recording source has a pointer to the  correct picture cache.
+  if (layer_tree_host()->IsRemoteServer()) {
+    recording_source_->set_engine_picture_cache(

[vmpstr, 2016/06/01 00:10:57]

likewise, we can mark things in the set function? Ie unmark the old cache (if it
was there) and mark the new cache (if it exists)

[nyquist, 2016/06/04 00:24:57]

Done.

+        layer_tree_host()->engine_picture_cache());
+  }
+  if (layer_tree_host()->IsRemoteClient()) {
+    recording_source_->set_client_picture_cache(
+        layer_tree_host()->client_picture_cache());
+  }
+  // Ensure that the currently empty RecordingSource is set in the marked state.
+  recording_source_->MarkForRegistration();
+
   recording_source_->SetSlowdownRasterScaleFactor(
       host->debug_state().slow_down_raster_scale_factor);
   // If we need to enable image decode tasks, then we have to generate the
   // discardable images metadata.
   const LayerTreeSettings& settings = layer_tree_host()->settings();
   recording_source_->SetGenerateDiscardableImagesMetadata(
       settings.image_decode_tasks_enabled);
 }
 
 void PictureLayer::SetNeedsDisplayRect(const gfx::Rect& layer_rect) {
@@ skipping 87 matching lines @@
 void PictureLayer::SetTypeForProtoSerialization(proto::LayerNode* proto) const {
   proto->set_type(proto::LayerNode::PICTURE_LAYER);
 }
 
 void PictureLayer::LayerSpecificPropertiesToProto(
     proto::LayerProperties* proto) {
   Layer::LayerSpecificPropertiesToProto(proto);
   DropRecordingSourceContentIfInvalid();
 
   proto::PictureLayerProperties* picture = proto->mutable_picture();
-  recording_source_->ToProtobuf(
-      picture->mutable_recording_source(),
-      layer_tree_host()->image_serialization_processor());
+  recording_source_->ToProtobuf(picture->mutable_recording_source());
+
   RegionToProto(last_updated_invalidation_, picture->mutable_invalidation());
   picture->set_is_mask(is_mask_);
   picture->set_nearest_neighbor(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_)
+  if (!recording_source_) {
     recording_source_.reset(new RecordingSource);
+    // A RecordingSource is only ever deserialized on the client.
+    recording_source_->set_client_picture_cache(
+        layer_tree_host()->client_picture_cache());
+  }
 
-  recording_source_->FromProtobuf(
-      picture.recording_source(),
-      layer_tree_host()->image_serialization_processor());
+  recording_source_->FromProtobuf(picture.recording_source());
 
   Region new_invalidation = RegionFromProto(picture.invalidation());
   last_updated_invalidation_.Swap(&new_invalidation);
   is_mask_ = picture.is_mask();
   nearest_neighbor_ = picture.nearest_neighbor();
 
   update_source_frame_number_ = picture.update_source_frame_number();
 }
 
 void PictureLayer::RunMicroBenchmark(MicroBenchmark* benchmark) {
@@ skipping 18 matching lines @@
   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();
   }
 }
 
 }  // namespace cc