| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index fbc4a820f982496949dce7d3040f3a0518f703c4..3dff6e04629f66bd80988edd2bddfd4b9a1fab4e 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -1964,6 +1964,11 @@ void LayerTreeHostImpl::DidChangeTopControlsPosition() {
|
| SetFullRootLayerDamage();
|
| }
|
|
|
| +void LayerTreeHostImpl::DidFinishTopControlsGesture() {
|
| + if (input_handler_client_)
|
| + input_handler_client_->DidFinishTopControlsGesture();
|
| +}
|
| +
|
| bool LayerTreeHostImpl::EnsureRenderSurfaceLayerList() {
|
| active_tree_->UpdateDrawProperties();
|
| return !active_tree_->RenderSurfaceLayerList().empty();
|
| @@ -2018,9 +2023,6 @@ InputHandler::ScrollStatus LayerTreeHostImpl::ScrollBegin(
|
| gfx::Point viewport_point, InputHandler::ScrollInputType type) {
|
| TRACE_EVENT0("cc", "LayerTreeHostImpl::ScrollBegin");
|
|
|
| - if (top_controls_manager_)
|
| - top_controls_manager_->ScrollBegin();
|
| -
|
| DCHECK(!CurrentlyScrollingLayer());
|
| ClearCurrentlyScrollingLayer();
|
|
|
| @@ -2046,6 +2048,9 @@ InputHandler::ScrollStatus LayerTreeHostImpl::ScrollBegin(
|
| potentially_scrolling_layer_impl = RootScrollLayer();
|
|
|
| if (potentially_scrolling_layer_impl) {
|
| + if (top_controls_manager_)
|
| + top_controls_manager_->ScrollBegin();
|
| +
|
| active_tree_->SetCurrentlyScrollingLayer(
|
| potentially_scrolling_layer_impl);
|
| should_bubble_scrolls_ = (type != NonBubblingGesture);
|
|
|