cc/animation/animation_player.cc - Issue 1009233002: CC Animations: Port Impl-only-scrolling to use compositor animation timelines.

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/animation/animation_player.cc

Issue 1009233002: CC Animations: Port Impl-only-scrolling to use compositor animation timelines. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ui

Patch Set: Revert AnimationHost::thread_instance_ deletion back. Created 5 years, 5 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

Index: cc/animation/animation_player.cc

diff --git a/cc/animation/animation_player.cc b/cc/animation/animation_player.cc

index 603ffa97e939d10368c37a6d7808cce02ececd20..e6677bb1cd7cf5961fd11d8e348108840404d7ac 100644

--- a/cc/animation/animation_player.cc

+++ b/cc/animation/animation_player.cc

@@ -119,6 +119,9 @@ void AnimationPlayer::UnbindElementAnimations() {

}

void AnimationPlayer::AddAnimation(scoped_ptr<Animation> animation) {

+ DCHECK(animation->target_property() != Animation::SCROLL_OFFSET ||

Ian Vollick 2015/07/08 00:42:25 nit: DCHECK_IMPLIES is, I think, what you want her

loyso (OOO) 2015/07/08 01:13:45 Done.

+ (animation_host_ && animation_host_->SupportsScrollAnimations()));

if (element_animations_) {

element_animations_->layer_animation_controller()->AddAnimation(

animation.Pass());

« no previous file with comments | « cc/animation/animation_host_unittest.cc ('k') | cc/animation/animation_timeline_unittest.cc » ('j') | cc/trees/layer_tree_host_impl.cc » ('J')