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

cc/layers/solid_color_scrollbar_layer.cc

Index: cc/layers/solid_color_scrollbar_layer.cc
diff --git a/cc/layers/solid_color_scrollbar_layer.cc b/cc/layers/solid_color_scrollbar_layer.cc
index 123b7ae677a63e224afeea47c4f876ad69b9fd09..98f90ccd8d760eb647ca5f00a7104b6f3a467483 100644
--- a/cc/layers/solid_color_scrollbar_layer.cc
+++ b/cc/layers/solid_color_scrollbar_layer.cc
@@ -47,6 +47,20 @@ SolidColorScrollbarLayer::SolidColorScrollbarLayerInputs::
       track_start(track_start),
       is_left_side_vertical_scrollbar(is_left_side_vertical_scrollbar) {}
 
+SolidColorScrollbarLayer::SolidColorScrollbarLayer(
+    int engine_layer_id,
+    ScrollbarOrientation orientation,
+    int thumb_thickness,
+    int track_start,
+    bool is_left_side_vertical_scrollbar,
+    int scroll_layer_id)
+    : Layer(engine_layer_id),
+      solid_color_scrollbar_layer_inputs_(orientation,
+                                          thumb_thickness,
+                                          track_start,
+                                          is_left_side_vertical_scrollbar,
+                                          scroll_layer_id) {}
+
 SolidColorScrollbarLayer::SolidColorScrollbarLayerInputs::
     ~SolidColorScrollbarLayerInputs() = default;
 
@@ -70,6 +84,41 @@ ScrollbarLayerInterface* SolidColorScrollbarLayer::ToScrollbarLayer() {
   return this;
 }
 
+void SolidColorScrollbarLayer::ToLayerNodeProto(proto::LayerNode* proto) const {
+  Layer::ToLayerNodeProto(proto);
+
+  proto::SolidColorScrollbarLayerProperties* scrollbar =
+      proto->mutable_solid_scrollbar();
+  scrollbar->set_scroll_layer_id(
+      solid_color_scrollbar_layer_inputs_.scroll_layer_id);
+  scrollbar->set_thumb_thickness(
+      solid_color_scrollbar_layer_inputs_.thumb_thickness);
+  scrollbar->set_track_start(solid_color_scrollbar_layer_inputs_.track_start);
+  scrollbar->set_is_left_side_vertical_scrollbar(
+      solid_color_scrollbar_layer_inputs_.is_left_side_vertical_scrollbar);
+  scrollbar->set_orientation(ScrollbarOrientationToProto(
+      solid_color_scrollbar_layer_inputs_.orientation));
+}
+
+void SolidColorScrollbarLayer::FromLayerNodeProto(
+    const proto::LayerNode& proto,
+    const LayerIdMap& layer_map,
+    LayerTreeHost* layer_tree_host) {
+  Layer::FromLayerNodeProto(proto, layer_map, layer_tree_host);
+
+  const proto::SolidColorScrollbarLayerProperties& scrollbar =
+      proto.solid_scrollbar();
+  solid_color_scrollbar_layer_inputs_.scroll_layer_id =
+      scrollbar.scroll_layer_id();
+  solid_color_scrollbar_layer_inputs_.thumb_thickness =
+      scrollbar.thumb_thickness();
+  solid_color_scrollbar_layer_inputs_.track_start = scrollbar.track_start();
+  solid_color_scrollbar_layer_inputs_.is_left_side_vertical_scrollbar =
+      scrollbar.is_left_side_vertical_scrollbar();
+  solid_color_scrollbar_layer_inputs_.orientation =
+      ScrollbarOrientationFromProto(scrollbar.orientation());
+}
+
 void SolidColorScrollbarLayer::SetOpacity(float opacity) {
   // The opacity of a solid color scrollbar layer is always 0 on main thread.
   DCHECK_EQ(opacity, 0.f);
@@ -118,39 +167,4 @@ void SolidColorScrollbarLayer::SetTypeForProtoSerialization(
   proto->set_type(proto::LayerNode::SOLID_COLOR_SCROLLBAR_LAYER);
 }
 
-void SolidColorScrollbarLayer::LayerSpecificPropertiesToProto(
-    proto::LayerProperties* proto,
-    bool inputs_only) {
-  Layer::LayerSpecificPropertiesToProto(proto, inputs_only);
-
-  proto::SolidColorScrollbarLayerProperties* scrollbar =
-      proto->mutable_solid_scrollbar();
-  scrollbar->set_scroll_layer_id(
-      solid_color_scrollbar_layer_inputs_.scroll_layer_id);
-  scrollbar->set_thumb_thickness(
-      solid_color_scrollbar_layer_inputs_.thumb_thickness);
-  scrollbar->set_track_start(solid_color_scrollbar_layer_inputs_.track_start);
-  scrollbar->set_is_left_side_vertical_scrollbar(
-      solid_color_scrollbar_layer_inputs_.is_left_side_vertical_scrollbar);
-  scrollbar->set_orientation(ScrollbarOrientationToProto(
-      solid_color_scrollbar_layer_inputs_.orientation));
-}
-
-void SolidColorScrollbarLayer::FromLayerSpecificPropertiesProto(
-    const proto::LayerProperties& proto) {
-  Layer::FromLayerSpecificPropertiesProto(proto);
-
-  const proto::SolidColorScrollbarLayerProperties& scrollbar =
-      proto.solid_scrollbar();
-  solid_color_scrollbar_layer_inputs_.scroll_layer_id =
-      scrollbar.scroll_layer_id();
-  solid_color_scrollbar_layer_inputs_.thumb_thickness =
-      scrollbar.thumb_thickness();
-  solid_color_scrollbar_layer_inputs_.track_start = scrollbar.track_start();
-  solid_color_scrollbar_layer_inputs_.is_left_side_vertical_scrollbar =
-      scrollbar.is_left_side_vertical_scrollbar();
-  solid_color_scrollbar_layer_inputs_.orientation =
-      ScrollbarOrientationFromProto(scrollbar.orientation());
-}
-
 }  // namespace cc