third_party/WebKit/Source/platform/animation/CompositorAnimationPlayerTest.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

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: third_party/WebKit/Source/platform/animation/CompositorAnimationPlayerTest.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.h ('k') | third_party/WebKit/Source/platform/animation/CompositorAnimationTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/animation/CompositorAnimationPlayerTest.cpp

diff --git a/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayerTest.cpp b/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayerTest.cpp

index daa8206dc7cac27c65eb85a016064639f45ea6f7..25d8fdcf312291caa8353c5292478aec55773af2 100644

--- a/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayerTest.cpp

+++ b/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayerTest.cpp

@@ -44,7 +44,7 @@ public:

return m_player.get();

}

- std::unique_ptr<CompositorAnimationPlayer> m_player;

+ OwnPtr<CompositorAnimationPlayer> m_player;

};

class CompositorAnimationPlayerTest : public CompositorTest {

@@ -56,7 +56,7 @@ TEST_F(CompositorAnimationPlayerTest, NullDelegate)

{

std::unique_ptr<CompositorAnimationDelegateForTesting> delegate(new CompositorAnimationDelegateForTesting);

- std::unique_ptr<CompositorAnimationPlayer> player = CompositorAnimationPlayer::create();

+ OwnPtr<CompositorAnimationPlayer> player = CompositorAnimationPlayer::create();

cc::AnimationPlayer* ccPlayer = player->animationPlayer();

player->setAnimationDelegate(delegate.get());

@@ -76,7 +76,7 @@ TEST_F(CompositorAnimationPlayerTest, NotifyFromCCAfterCompositorPlayerDeletion)

{

std::unique_ptr<CompositorAnimationDelegateForTesting> delegate(new CompositorAnimationDelegateForTesting);

- std::unique_ptr<CompositorAnimationPlayer> player = CompositorAnimationPlayer::create();

+ OwnPtr<CompositorAnimationPlayer> player = CompositorAnimationPlayer::create();

scoped_refptr<cc::AnimationPlayer> ccPlayer = player->animationPlayer();

player->setAnimationDelegate(delegate.get());

@@ -92,7 +92,7 @@ TEST_F(CompositorAnimationPlayerTest, NotifyFromCCAfterCompositorPlayerDeletion)

TEST_F(CompositorAnimationPlayerTest, CompositorPlayerDeletionDetachesFromCCTimeline)

{

- std::unique_ptr<CompositorAnimationTimeline> timeline = CompositorAnimationTimeline::create();

+ OwnPtr<CompositorAnimationTimeline> timeline = CompositorAnimationTimeline::create();

std::unique_ptr<CompositorAnimationPlayerTestClient> client(new CompositorAnimationPlayerTestClient);

scoped_refptr<cc::AnimationTimeline> ccTimeline = timeline->animationTimeline();