cc/trees/layer_tree_host_impl.cc - Issue 661643004: [android] Remove unused scroll delta in TopControls

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: "Updated the Unittest" Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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..68ccf78fd623d3b28c13e994053cde0fbf5679bc 100644

--- a/cc/trees/layer_tree_host_impl.cc

+++ b/cc/trees/layer_tree_host_impl.cc

@@ -2585,11 +2585,8 @@ bool LayerTreeHostImpl::ShouldTopControlsConsumeScroll(

CurrentlyScrollingLayer() != OuterViewportScrollLayer())

return false;

- if (InnerViewportScrollLayer()->MaxScrollOffset().y() > 0)

- return true;

- if (OuterViewportScrollLayer() &&

- OuterViewportScrollLayer()->MaxScrollOffset().y() > 0)

+ if (active_tree()->TotalScrollOffset().y() <

+ active_tree()->TotalMaxScrollOffset().y())

return true;

return false;