| Index: cc/layer_tree_impl.h
|
| diff --git a/cc/layer_tree_impl.h b/cc/layer_tree_impl.h
|
| index 9c752b8eebc176e812ac458bd831ac37c5879432..e03c7f9ff1a0661fbd6901d2696cc257eb61526e 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);
|
| + void SetPinchZoomVerticalLayerId(int layer_id);
|
| +
|
| + 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();
|
| + ScrollbarLayerImpl* PinchZoomScrollbarHorizontal();
|
| + ScrollbarLayerImpl* PinchZoomScrollbarVertical();
|
| + 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_;
|
|
|