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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 676853002: Defer scroll status determination until scrolling has occurred (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | content/renderer/render_widget.cc » ('j') | content/renderer/render_widget.cc » ('J')
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 4ccc5fe8b5e1304a6dd056da3fce7ee0de1daf67..3a6ce660b629457d62bb3241471a234226c69a8b 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1769,7 +1769,7 @@ LayerImpl* LayerTreeHostImpl::CurrentlyScrollingLayer() const {
}
bool LayerTreeHostImpl::IsCurrentlyScrolling() const {
- return CurrentlyScrollingLayer() ||
+ return (did_lock_scrolling_layer_ && CurrentlyScrollingLayer()) ||
(InnerViewportScrollLayer() &&
InnerViewportScrollLayer()->IsExternalFlingActive()) ||
(OuterViewportScrollLayer() &&
@@ -2408,7 +2408,6 @@ InputHandler::ScrollStatus LayerTreeHostImpl::ScrollBegin(
active_tree_->SetCurrentlyScrollingLayer(scrolling_layer_impl);
should_bubble_scrolls_ = (type != NonBubblingGesture);
wheel_scrolling_ = (type == Wheel);
- client_->RenewTreePriority();
brianderson 2014/10/23 20:55:51 Why is this removed? Is it because we'll only hav
jdduke (slow) 2014/10/23 22:12:49 Right, unless there's another side effect of this
UMA_HISTOGRAM_BOOLEAN("TryScroll.SlowScroll", false);
return ScrollStarted;
}
« no previous file with comments | « no previous file | content/renderer/render_widget.cc » ('j') | content/renderer/render_widget.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698