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 4ccc5fe8b5e1304a6dd056da3fce7ee0de1daf67..af53e728025fa09b86b0701bd0225b73a2068562 100644 |
--- a/cc/trees/layer_tree_host_impl.cc |
+++ b/cc/trees/layer_tree_host_impl.cc |
@@ -1586,7 +1586,7 @@ void LayerTreeHostImpl::DrawLayers(FrameData* frame, |
if (draw_mode == DRAW_MODE_RESOURCELESS_SOFTWARE) { |
bool disable_picture_quad_image_filtering = |
- IsCurrentlyScrolling() || needs_animate_layers(); |
+ IsActivelyScrolling() || needs_animate_layers(); |
scoped_ptr<SoftwareRenderer> temp_software_renderer = |
SoftwareRenderer::Create(this, &settings_, output_surface_.get(), NULL); |
@@ -1768,8 +1768,8 @@ LayerImpl* LayerTreeHostImpl::CurrentlyScrollingLayer() const { |
return active_tree_->CurrentlyScrollingLayer(); |
} |
-bool LayerTreeHostImpl::IsCurrentlyScrolling() const { |
- return CurrentlyScrollingLayer() || |
+bool LayerTreeHostImpl::IsActivelyScrolling() const { |
+ return (did_lock_scrolling_layer_ && CurrentlyScrollingLayer()) || |
(InnerViewportScrollLayer() && |
InnerViewportScrollLayer()->IsExternalFlingActive()) || |
(OuterViewportScrollLayer() && |