| 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;
|
|
|