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

Unified Diff: content/renderer/input/input_handler_proxy.cc

Issue 1418493003: Let LayerTreeHostImpl::ScrollAnimated scroll the outer viewport. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile error for realz Created 5 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 | « cc/trees/layer_tree_impl.cc ('k') | content/renderer/input/input_handler_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/input/input_handler_proxy.cc
diff --git a/content/renderer/input/input_handler_proxy.cc b/content/renderer/input/input_handler_proxy.cc
index cee4871957beafd08bd22998161ab6b9e6d7a937..527e7ea39aec2bb0a0f4b9d86ac09256c546ab26 100644
--- a/content/renderer/input/input_handler_proxy.cc
+++ b/content/renderer/input/input_handler_proxy.cc
@@ -750,7 +750,7 @@ void InputHandlerProxy::ExtendBoostedFlingTimeout(
void InputHandlerProxy::Animate(base::TimeTicks time) {
// If using synchronous animate, then only expect Animate attempts started by
// the synchronous system. Don't let the InputHandler try to Animate also.
- DCHECK_IMPLIES(input_handler_->IsCurrentlyScrollingRoot(),
+ DCHECK_IMPLIES(input_handler_->IsCurrentlyScrollingInnerViewport(),
allow_root_animate_);
if (scroll_elasticity_controller_)
@@ -932,7 +932,8 @@ void InputHandlerProxy::RequestAnimation() {
// When a SynchronousInputHandler is present, root flings should go through
// it to allow it to control when or if the root fling is animated. Non-root
// flings always go through the normal InputHandler.
- if (synchronous_input_handler_ && input_handler_->IsCurrentlyScrollingRoot())
+ if (synchronous_input_handler_ &&
+ input_handler_->IsCurrentlyScrollingInnerViewport())
synchronous_input_handler_->SetNeedsSynchronousAnimateInput();
else
input_handler_->SetNeedsAnimateInput();
« no previous file with comments | « cc/trees/layer_tree_impl.cc ('k') | content/renderer/input/input_handler_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698