diff options
| author | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 06:58:06 +0000 |
|---|---|---|
| committer | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 06:58:06 +0000 |
| commit | a91e4f8be42c55cd44a3c98527480a899383e924 (patch) | |
| tree | ea8455b05abe2a3b719d7730aed286c9a691693c /cc | |
| parent | 225aa7de07993ff78f25353169453a1109c870a7 (diff) | |
| download | chromium_src-a91e4f8be42c55cd44a3c98527480a899383e924.zip chromium_src-a91e4f8be42c55cd44a3c98527480a899383e924.tar.gz chromium_src-a91e4f8be42c55cd44a3c98527480a899383e924.tar.bz2 | |
Only pass scrolls directly on the root scroll layer to top controls.
Do not rely on bubble scrolling to move top controls.
BUG=181686
Review URL: https://chromiumcodereview.appspot.com/12440038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/layer_tree_host_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc index bcd3248..2a6473c 100644 --- a/cc/layer_tree_host_impl.cc +++ b/cc/layer_tree_host_impl.cc @@ -1485,6 +1485,9 @@ bool LayerTreeHostImpl::ScrollBy(gfx::Point viewport_point, gfx::Vector2dF pending_delta = scroll_delta; bool did_scroll = false; + if (top_controls_manager_ && CurrentlyScrollingLayer() == RootScrollLayer()) + pending_delta = top_controls_manager_->ScrollBy(pending_delta); + for (LayerImpl* layer_impl = CurrentlyScrollingLayer(); layer_impl; layer_impl = layer_impl->parent()) { @@ -1492,9 +1495,6 @@ bool LayerTreeHostImpl::ScrollBy(gfx::Point viewport_point, continue; gfx::Vector2dF applied_delta; - if (top_controls_manager_ && layer_impl == RootScrollLayer()) - pending_delta = top_controls_manager_->ScrollBy(pending_delta); - // Gesture events need to be transformed from viewport coordinates to local // layer coordinates so that the scrolling contents exactly follow the // user's finger. In contrast, wheel events represent a fixed amount of |