cc/animation/element_animations_unittest.cc - Issue 1894023002: CC Animation: Make ElementAnimations a ref-counted object.

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/element_animations_unittest.cc

Issue 1894023002: CC Animation: Make ElementAnimations a ref-counted object. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: cc/animation/element_animations_unittest.cc

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

index ed51918e34ffd4862239b5b17f5492955244ddf7..90c622a3438bfce9bbb9f864e43799701b689bcd 100644

--- a/cc/animation/element_animations_unittest.cc

+++ b/cc/animation/element_animations_unittest.cc

@@ -37,7 +37,8 @@ TEST_F(ElementAnimationsTest, AttachToLayerInActiveTree) {

timeline_->AttachPlayer(player_);

player_->AttachLayer(layer_id_);

- ElementAnimations* element_animations = player_->element_animations();

+ scoped_refptr<ElementAnimations> element_animations =

+ player_->element_animations();

EXPECT_TRUE(element_animations);

EXPECT_TRUE(element_animations->needs_active_value_observations());

@@ -47,7 +48,7 @@ TEST_F(ElementAnimationsTest, AttachToLayerInActiveTree) {

GetImplTimelineAndPlayerByID();

- ElementAnimations* element_animations_impl =

+ scoped_refptr<ElementAnimations> element_animations_impl =

player_impl_->element_animations();

EXPECT_TRUE(element_animations_impl);

@@ -109,7 +110,8 @@ TEST_F(ElementAnimationsTest, AttachToNotYetCreatedLayer) {

player_->AttachLayer(layer_id_);

- ElementAnimations* element_animations = player_->element_animations();

+ scoped_refptr<ElementAnimations> element_animations =

+ player_->element_animations();

EXPECT_TRUE(element_animations);

EXPECT_FALSE(element_animations->needs_active_value_observations());

@@ -117,7 +119,7 @@ TEST_F(ElementAnimationsTest, AttachToNotYetCreatedLayer) {

host_->PushPropertiesTo(host_impl_);

- ElementAnimations* element_animations_impl =

+ scoped_refptr<ElementAnimations> element_animations_impl =

player_impl_->element_animations();

EXPECT_TRUE(element_animations_impl);

@@ -143,7 +145,8 @@ TEST_F(ElementAnimationsTest, AddRemovePlayers) {

timeline_->AttachPlayer(player_);

player_->AttachLayer(layer_id_);

- ElementAnimations* element_animations = player_->element_animations();

+ scoped_refptr<ElementAnimations> element_animations =

+ player_->element_animations();

EXPECT_TRUE(element_animations);

scoped_refptr<AnimationPlayer> player1 =

@@ -164,7 +167,7 @@ TEST_F(ElementAnimationsTest, AddRemovePlayers) {

host_->PushPropertiesTo(host_impl_);

GetImplTimelineAndPlayerByID();

- ElementAnimations* element_animations_impl =

+ scoped_refptr<ElementAnimations> element_animations_impl =

player_impl_->element_animations();

EXPECT_TRUE(element_animations_impl);

« no previous file with comments | « cc/animation/element_animations.cc ('k') | cc/test/animation_timelines_test_common.cc » ('j') | no next file with comments »