cc/blimp: Add (de)-serialization for PictureLayer and ScrollbarLayer.

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/blimp/client_picture_cache.h"
 #include "cc/blimp/engine_picture_cache.h"
@@ skipping 18 matching lines @@
   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;
 }
 
+PictureLayer::PictureLayer(int engine_layer_id, ContentLayerClient* client)
+    : Layer(engine_layer_id),
+      instrumentation_object_tracker_(id()),
+      update_source_frame_number_(-1),
+      is_mask_(false) {
+  picture_layer_inputs_.client = client;
+}
+
 PictureLayer::PictureLayer(ContentLayerClient* client,
                            std::unique_ptr<RecordingSource> source)
     : PictureLayer(client) {
   recording_source_ = std::move(source);
 }
 
 PictureLayer::~PictureLayer() {
 }
 
 std::unique_ptr<LayerImpl> PictureLayer::CreateLayerImpl(
@@ skipping 154 matching lines @@
 }
 
 void PictureLayer::SetTypeForProtoSerialization(proto::LayerNode* proto) const {
   proto->set_type(proto::LayerNode::PICTURE_LAYER);
 }
 
 void PictureLayer::LayerSpecificPropertiesToProto(proto::LayerProperties* proto,
                                                   bool inputs_only) {
   Layer::LayerSpecificPropertiesToProto(proto, inputs_only);
   DropRecordingSourceContentIfInvalid();
+  proto::PictureLayerProperties* picture = proto->mutable_picture();
 
-  proto::PictureLayerProperties* picture = proto->mutable_picture();
-  recording_source_->ToProtobuf(picture->mutable_recording_source());
-
+  picture->set_nearest_neighbor(picture_layer_inputs_.nearest_neighbor);
   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;
 
       GetLayerTree()->engine_picture_cache()->MarkUsed(picture.get());
     }
   }
 
+  if (inputs_only)
+    return;
+
+  recording_source_->ToProtobuf(picture->mutable_recording_source());
   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.
@@ skipping 63 matching lines @@
     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