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

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: 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') | no next file » | 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..38fb9f935f3c1ec8c1ca645c13e2ab4a4bbac6b2 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2585,6 +2585,11 @@ bool LayerTreeHostImpl::ShouldTopControlsConsumeScroll(
CurrentlyScrollingLayer() != OuterViewportScrollLayer())
return false;
+ if (scroll_delta.y() > 0 && top_controls_manager_->ContentTopOffset() == 0 &&
jdduke (slow) 2014/10/21 16:09:10 This is probably worth a comment along the lines o
sujith 2014/10/22 14:20:15 Done.
+ (InnerViewportScrollLayer()->TotalScrollOffset().y() ==
+ InnerViewportScrollLayer()->MaxScrollOffset().y()))
+ return false;
+
if (InnerViewportScrollLayer()->MaxScrollOffset().y() > 0)
return true;
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698