Implement pinch-zoom scaling for main-frame scrollbars and pinch-zoom overlay scrollbars.

cc/layer_tree_impl.h

Index: cc/layer_tree_impl.h
diff --git a/cc/layer_tree_impl.h b/cc/layer_tree_impl.h
index ee2b6df0491647cee45fcc75c78e5b431b4949b1..7019134cb2403264a63ec3d51af8d28bcbcf1604 100644
--- a/cc/layer_tree_impl.h
+++ b/cc/layer_tree_impl.h
@@ -34,6 +34,7 @@ class OutputSurface;
 class PaintTimeCounter;
 class Proxy;
 class ResourceProvider;
+class ScrollbarLayerImpl;
 class TileManager;
 struct RendererCapabilities;
 
@@ -190,9 +191,24 @@ class CC_EXPORT LayerTreeImpl {
   // Useful for debug assertions, probably shouldn't be used for anything else.
   Proxy* proxy() const;
 
+  void SetPinchZoomHorizontalLayerId(int layer_id);
+  ScrollbarLayerImpl* PinchZoomScrollbarHorizontal();

[enne (OOO), 2013/03/11 21:08:24]

This should not be public.

[wjmaclean, 2013/03/12 16:13:07]

Done.

+  void SetPinchZoomVerticalLayerId(int layer_id);
+  ScrollbarLayerImpl* PinchZoomScrollbarVertical();

[enne (OOO), 2013/03/11 21:08:24]

Neither should this.

[wjmaclean, 2013/03/12 16:13:07]

Done.

+
+  void DidBeginScroll();
+  void DidUpdateScroll();
+  void DidEndScroll();
+
 protected:
   LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl);
 
+  // Hide existence of pinch-zoom scrollbars.
+  void UpdatePinchZoomScrollbars();
+  void FadeInPinchZoomScrollbars();
+  void FadeOutPinchZoomScrollbars();
+  bool HasPinchZoomScrollbars() const;
+
   LayerTreeHostImpl* layer_tree_host_impl_;
   int source_frame_number_;
   scoped_ptr<LayerImpl> root_layer_;
@@ -202,6 +218,9 @@ protected:
   SkColor background_color_;
   bool has_transparent_background_;
 
+  int pinch_zoom_scrollbar_horizontal_layer_id_;
+  int pinch_zoom_scrollbar_vertical_layer_id_;
+
   float page_scale_factor_;
   float page_scale_delta_;
   float sent_page_scale_delta_;