cc/trees/layer_tree_host_impl.cc - Issue 167013003: cc: Don't schedule top controls animation when there isn't one

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 167013003: cc: Don't schedule top controls animation when there isn't one (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: mismatch smismatch Created 6 years, 10 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/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 ec89ddcfd734a055a9cdc9fa4dd9bc60bc870f99..dfdb11573c739c3e61f6d8d939723786e933b807 100644

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

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

@@ -2633,7 +2633,7 @@ void LayerTreeHostImpl::AnimatePageScale(base::TimeTicks time) {

}

void LayerTreeHostImpl::AnimateTopControls(base::TimeTicks time) {

- if (!top_controls_manager_)

+ if (!top_controls_manager_ || !top_controls_manager_->animation())

return;

gfx::Vector2dF scroll = top_controls_manager_->Animate(time);

if (active_tree_->TotalScrollOffset().y() == 0.f)

« no previous file with comments | « no previous file | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »