| 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 e0d2e26149d089785fae8fb3c501d32b5147a309..9540d04049df45c7c88d9c58e01fecf8041a3be1 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -2570,9 +2570,11 @@ bool LayerTreeHostImpl::ScrollBy(const gfx::Point& viewport_point,
|
| unused_root_delta.set_y(0.0f);
|
| // Disable overscroll on axes which is impossible to scroll.
|
| if (settings_.report_overscroll_only_for_scrollable_axes) {
|
| - if (std::abs(active_tree_->TotalMaxScrollOffset().x()) <= kEpsilon)
|
| + if (std::abs(active_tree_->TotalMaxScrollOffset().x()) <= kEpsilon ||
|
| + !layer_impl->user_scrollable_horizontal())
|
| unused_root_delta.set_x(0.0f);
|
| - if (std::abs(active_tree_->TotalMaxScrollOffset().y()) <= kEpsilon)
|
| + if (std::abs(active_tree_->TotalMaxScrollOffset().y()) <= kEpsilon ||
|
| + !layer_impl->user_scrollable_vertical())
|
| unused_root_delta.set_y(0.0f);
|
| }
|
| }
|
|
|