cc/animation/animation_player.cc - Issue 2049063002: Revert of Use element id's for animations

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 2049063002: Revert of Use element id's for animations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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/animation/animation_player.cc

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

index 4cbd2a027aa23f0c8d1af605ef48d56d72a963d7..f77bdd796bf775c9ce9c0702d1f7219f488a95e8 100644

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

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

@@ -22,7 +22,8 @@

animation_timeline_(),

element_animations_(),

animation_delegate_(),

- id_(id) {

+ id_(id),

+ element_id_(0) {

DCHECK(id_);

}

@@ -57,7 +58,7 @@

}

void AnimationPlayer::AttachElement(ElementId element_id) {

- DCHECK(!element_id_);

+ DCHECK_EQ(element_id_, 0);

DCHECK(element_id);

element_id_ = element_id;

@@ -73,7 +74,7 @@

if (animation_host_)

UnregisterPlayer();

- element_id_ = ElementId();

+ element_id_ = 0;

}

void AnimationPlayer::RegisterPlayer() {

« no previous file with comments | « cc/animation/animation_host_perftest.cc ('k') | cc/animation/animation_player_unittest.cc » ('j') | no next file with comments »