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

cc/layers/solid_color_scrollbar_layer.h

 // Copyright 2013 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.
 
 #ifndef CC_LAYERS_SOLID_COLOR_SCROLLBAR_LAYER_H_
 #define CC_LAYERS_SOLID_COLOR_SCROLLBAR_LAYER_H_
 
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer.h"
@@ skipping 10 matching lines @@
       ScrollbarOrientation orientation,
       int thumb_thickness,
       int track_start,
       bool is_left_side_vertical_scrollbar,
       int scroll_layer_id);
 
   // Layer overrides.
   bool OpacityCanAnimateOnImplThread() const override;
   bool AlwaysUseActiveTreeOpacity() const override;
   ScrollbarLayerInterface* ToScrollbarLayer() override;
+  void ToLayerNodeProto(proto::LayerNode* proto) const override;
+  void FromLayerNodeProto(const proto::LayerNode& proto,
+                          const LayerIdMap& layer_map,
+                          LayerTreeHost* layer_tree_host) override;
 
   void SetOpacity(float opacity) override;
   void PushPropertiesTo(LayerImpl* layer) override;
 
   void SetNeedsDisplayRect(const gfx::Rect& rect) override;
 
   // ScrollbarLayerInterface
   int ScrollLayerId() const override;
   void SetScrollLayer(int layer_id) override;
 
   ScrollbarOrientation orientation() const override;
 
  protected:
   SolidColorScrollbarLayer(ScrollbarOrientation orientation,
                            int thumb_thickness,
                            int track_start,
                            bool is_left_side_vertical_scrollbar,
                            int scroll_layer_id);
   ~SolidColorScrollbarLayer() override;
 
   // Layer overrides for proto conversions.
   void SetTypeForProtoSerialization(proto::LayerNode* proto) const override;
-  void LayerSpecificPropertiesToProto(proto::LayerProperties* proto,
-                                      bool inputs_only) override;
-  void FromLayerSpecificPropertiesProto(
-      const proto::LayerProperties& proto) override;
 
  private:
   friend class LayerSerializationTest;
 
   // Encapsulate all data, callbacks, interfaces received from the embedder.
   struct SolidColorScrollbarLayerInputs {
     SolidColorScrollbarLayerInputs(ScrollbarOrientation orientation,
                                    int thumb_thickness,
                                    int track_start,
                                    bool is_left_side_vertical_scrollbar,
                                    int scroll_layer_id);
     ~SolidColorScrollbarLayerInputs();
 
     int scroll_layer_id;
     ScrollbarOrientation orientation;
     int thumb_thickness;
     int track_start;
     bool is_left_side_vertical_scrollbar;
   };
 
   SolidColorScrollbarLayerInputs solid_color_scrollbar_layer_inputs_;
 
   DISALLOW_COPY_AND_ASSIGN(SolidColorScrollbarLayer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_SOLID_COLOR_SCROLLBAR_LAYER_H_