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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 661643004: [android] Remove unused scroll delta in TopControls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Unittest Added 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 | « AUTHORS ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
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 c5b9566fc070a1d554a63823d31fd26135e972de..44c3ac712ff8afd2fe5f8eaaaff73e6e0b7e20fd 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2585,6 +2585,12 @@ bool LayerTreeHostImpl::ShouldTopControlsConsumeScroll(
CurrentlyScrollingLayer() != OuterViewportScrollLayer())
return false;
+ // Avoid confusing top controls bookkeeping with positive overscroll deltas.
+ if (scroll_delta.y() > 0 && top_controls_manager_->ContentTopOffset() == 0 &&
+ (InnerViewportScrollLayer()->TotalScrollOffset().y() ==
aelias_OOO_until_Jul13 2014/10/22 18:40:47 This should check OuterViewportScrollLayer as well
sujith 2014/10/23 06:57:10 Done.
+ InnerViewportScrollLayer()->MaxScrollOffset().y()))
+ return false;
+
if (InnerViewportScrollLayer()->MaxScrollOffset().y() > 0)
return true;
« no previous file with comments | « AUTHORS ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698