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

cc/layers/layer_unittest.cc

 // Copyright 2011 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/layer.h"
 
 #include <stddef.h>
 
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/animation/animation_host.h"
@@ skipping 342 matching lines @@
     layer->inputs_.user_scrollable_vertical =
         !layer->inputs_.user_scrollable_vertical;
     layer->inputs_.scroll_offset = gfx::ScrollOffset(3, 14);
     layer->inputs_.update_rect = gfx::Rect(14, 15);
 
     VerifyBaseLayerPropertiesSerializationAndDeserialization(layer.get());
   }
 
   void VerifySolidColorScrollbarLayerAfterSerializationAndDeserialization(
       scoped_refptr<SolidColorScrollbarLayer> source_scrollbar) {
-    proto::LayerProperties serialized_scrollbar;
-    source_scrollbar->LayerSpecificPropertiesToProto(&serialized_scrollbar,
-                                                     false);
+    proto::LayerNode serialized_scrollbar_node;
+    source_scrollbar->ToLayerNodeProto(&serialized_scrollbar_node);
 
     scoped_refptr<SolidColorScrollbarLayer> deserialized_scrollbar =
         SolidColorScrollbarLayer::Create(ScrollbarOrientation::HORIZONTAL, -1,
                                          -1, false, Layer::INVALID_ID);
     deserialized_scrollbar->inputs_.layer_id =
         source_scrollbar->inputs_.layer_id;
 
     // FromLayerSpecificPropertiesProto expects a non-null LayerTreeHost to be
     // set.
-    deserialized_scrollbar->SetLayerTreeHost(layer_tree_host_.get());
-    deserialized_scrollbar->FromLayerSpecificPropertiesProto(
-        serialized_scrollbar);
+    Layer::LayerIdMap layer_map;
+    deserialized_scrollbar->FromLayerNodeProto(
+        serialized_scrollbar_node, layer_map, layer_tree_host_.get());
 
     EXPECT_EQ(source_scrollbar->solid_color_scrollbar_layer_inputs_.track_start,
               deserialized_scrollbar->solid_color_scrollbar_layer_inputs_
                   .track_start);
     EXPECT_EQ(
         source_scrollbar->solid_color_scrollbar_layer_inputs_.thumb_thickness,
         deserialized_scrollbar->solid_color_scrollbar_layer_inputs_
             .thumb_thickness);
     EXPECT_EQ(
         source_scrollbar->solid_color_scrollbar_layer_inputs_.scroll_layer_id,
@@ skipping 2087 matching lines @@
   EXPECT_EQ(MutableProperty::kNone, impl_layer->mutable_properties());
 
   test_layer->PushPropertiesTo(impl_layer.get());
 
   EXPECT_EQ(ElementId(2, 0), impl_layer->element_id());
   EXPECT_EQ(MutableProperty::kTransform, impl_layer->mutable_properties());
 }
 
 }  // namespace
 }  // namespace cc