cc/test/animation_timelines_test_common.h - Issue 1944623002: CC Animation: Use ElementId to attach CC animation players.

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/test/animation_timelines_test_common.h

Issue 1944623002: CC Animation: Use ElementId to attach CC animation players. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@erasedomids

Patch Set: Created 4 years, 8 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

« no previous file with comments | « cc/test/animation_test_common.cc ('k') | cc/test/animation_timelines_test_common.cc » ('j') | third_party/WebKit/Source/core/animation/CompositorAnimations.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/test/animation_timelines_test_common.h

diff --git a/cc/test/animation_timelines_test_common.h b/cc/test/animation_timelines_test_common.h

index f1b75747231ac8868afcb66cb4ad9cfaa04f349b..d3c9406c944e9694cde5a8e214aa2bf7d71f8ab6 100644

--- a/cc/test/animation_timelines_test_common.h

+++ b/cc/test/animation_timelines_test_common.h

@@ -227,10 +227,10 @@ class AnimationTimelinesTest : public testing::Test {

void AnimateLayersTransferEvents(base::TimeTicks time,

unsigned expect_events);

- AnimationPlayer* GetPlayerForLayerId(ElementId element_id);

- AnimationPlayer* GetImplPlayerForLayerId(ElementId element_id);

+ AnimationPlayer* GetPlayerForElementId(ElementId element_id);

+ AnimationPlayer* GetImplPlayerForElementId(ElementId element_id);

- int NextTestLayerId();

+ ElementId NextTestElementId();

TestHostClient client_;

TestHostClient client_impl_;

@@ -242,7 +242,7 @@ class AnimationTimelinesTest : public testing::Test {

const int player_id_;

int element_id_;

- int next_test_layer_id_;

+ ElementId next_test_element_id_;

scoped_refptr<AnimationTimeline> timeline_;

scoped_refptr<AnimationPlayer> player_;