third_party/WebKit/Source/platform/animation/CompositorAnimationHostTest.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/CompositorAnimationHostTest.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/CompositorAnimation.cpp ('k') | third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 30b473593436db2d32cb770fb80438902b73d83a..1514d2d4abfe33b449ae8ecf196e69530f44cac3 100644

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

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

@@ -8,8 +8,6 @@

#include "platform/animation/CompositorAnimationTimeline.h"

#include "platform/testing/CompositorTest.h"

#include "platform/testing/WebLayerTreeViewImplForTesting.h"

-#include "wtf/PtrUtil.h"

-#include <memory>

namespace blink {

@@ -18,13 +16,13 @@ class CompositorAnimationHostTest : public CompositorTest {

TEST_F(CompositorAnimationHostTest, AnimationHostNullWhenTimelineDetached)

{

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

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

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

EXPECT_FALSE(ccTimeline->animation_host());

EXPECT_TRUE(timeline->compositorAnimationHost().isNull());

- std::unique_ptr<WebLayerTreeView> layerTreeHost = wrapUnique(new WebLayerTreeViewImplForTesting);

+ OwnPtr<WebLayerTreeView> layerTreeHost = adoptPtr(new WebLayerTreeViewImplForTesting);

DCHECK(layerTreeHost);

layerTreeHost->attachCompositorAnimationTimeline(timeline->animationTimeline());