Pinch/Zoom Infrastructure & Plumbing CL

cc/layers/solid_color_scrollbar_layer.h

Index: cc/layers/solid_color_scrollbar_layer.h
diff --git a/cc/layers/solid_color_scrollbar_layer.h b/cc/layers/solid_color_scrollbar_layer.h
index 9c0dc1ed47300c12ae1910ca2e8ab790081c04e8..339d5339fb3848fe717d2d0730e6c8a0e9430dfb 100644
--- a/cc/layers/solid_color_scrollbar_layer.h
+++ b/cc/layers/solid_color_scrollbar_layer.h
@@ -27,9 +27,13 @@ class CC_EXPORT SolidColorScrollbarLayer : public ScrollbarLayerInterface,
   virtual bool OpacityCanAnimateOnImplThread() const OVERRIDE;
   virtual ScrollbarLayerInterface* ToScrollbarLayer() OVERRIDE;
 
+  virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
+  virtual void PushScrollClipPropertiesTo(LayerImpl* layer) OVERRIDE;
+
   // ScrollbarLayerInterface
   virtual int ScrollLayerId() const OVERRIDE;
-  virtual void SetScrollLayerId(int id) OVERRIDE;
+  virtual void SetScrollLayer(int layer_id) OVERRIDE;
+  virtual void SetClipLayer(int layer_id) OVERRIDE;
 
   virtual ScrollbarOrientation orientation() const OVERRIDE;
 
@@ -42,6 +46,7 @@ class CC_EXPORT SolidColorScrollbarLayer : public ScrollbarLayerInterface,
 
  private:
   int scroll_layer_id_;
+  int clip_layer_id_;
   ScrollbarOrientation orientation_;
   int thumb_thickness_;
   bool is_left_side_vertical_scrollbar_;