cc/input/top_controls_manager.cc - Issue 1001833005: Update from https://crrev.com/320343

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/input/top_controls_manager.cc

Issue 1001833005: Update from https://crrev.com/320343 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Supress Created 5 years, 9 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:

Index: cc/input/top_controls_manager.cc

diff --git a/cc/input/top_controls_manager.cc b/cc/input/top_controls_manager.cc

index c8bd5348721ca72c007c38ada13b9dd650b536f8..56c9d8f43ff8d14419cb93986ebce052f278fda2 100644

--- a/cc/input/top_controls_manager.cc

+++ b/cc/input/top_controls_manager.cc

@@ -107,6 +107,9 @@ gfx::Vector2dF TopControlsManager::ScrollBy(

if (pinch_gesture_active_)

return pending_delta;

+ if (!TopControlsHeight())

+ return pending_delta;

if (permitted_state_ == SHOWN && pending_delta.y() > 0)

return pending_delta;

else if (permitted_state_ == HIDDEN && pending_delta.y() < 0)

« no previous file with comments | « cc/cc_unittests.isolate ('k') | cc/input/top_controls_manager_unittest.cc » ('j') | no next file with comments »