| 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 02cfc474055d3cd32affea43ff7498957a8eb7a9..d6ac88df2e02d70bddf4f6a46d68eb04f036733d 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -1866,11 +1866,7 @@ LayerImpl* LayerTreeHostImpl::CurrentlyScrollingLayer() const {
|
| }
|
|
|
| bool LayerTreeHostImpl::IsActivelyScrolling() const {
|
| - return (did_lock_scrolling_layer_ && CurrentlyScrollingLayer()) ||
|
| - (InnerViewportScrollLayer() &&
|
| - InnerViewportScrollLayer()->IsExternalScrollActive()) ||
|
| - (OuterViewportScrollLayer() &&
|
| - OuterViewportScrollLayer()->IsExternalScrollActive());
|
| + return did_lock_scrolling_layer_ && CurrentlyScrollingLayer();
|
| }
|
|
|
| // Content layers can be either directly scrollable or contained in an outer
|
|
|