Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(813)

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 140413007: Made fling gestures always bubble between inner and outer viewports. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Made test non-symmetric Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 326f1fe2afe25747876d5adae91fa658b5661700..16571a2e4f1ba1b222aec0de628edd1fd258390b 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2240,7 +2240,9 @@ bool LayerTreeHostImpl::ScrollBy(gfx::Point viewport_point,
did_scroll_x |= did_move_layer_x;
did_scroll_y |= did_move_layer_y;
if (!did_move_layer_x && !did_move_layer_y) {
- if (should_bubble_scrolls_ || !did_lock_scrolling_layer_)
+ // Scrolls should always bubble between the outer and inner viewports
+ if (should_bubble_scrolls_ || !did_lock_scrolling_layer_ ||
+ layer_impl == OuterViewportScrollLayer())
continue;
else
break;
« no previous file with comments | « no previous file | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698