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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

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

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

index 2b73cd831014f25808bf54d6b22619cb0e570c4c..63becca188b64d6a98367fd892ec6e3236e8ccaf 100644

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

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

@@ -13,6 +13,7 @@

#include "platform/animation/CompositorFloatAnimationCurve.h"

#include "platform/animation/CompositorScrollOffsetAnimationCurve.h"

#include "platform/animation/CompositorTransformAnimationCurve.h"

+#include <memory>

using cc::Animation;

using cc::AnimationIdProvider;

@@ -126,7 +127,7 @@ std::unique_ptr<cc::Animation> CompositorAnimation::passAnimation()

return std::move(m_animation);

}

-PassOwnPtr<CompositorFloatAnimationCurve> CompositorAnimation::floatCurveForTesting() const

+std::unique_ptr<CompositorFloatAnimationCurve> CompositorAnimation::floatCurveForTesting() const

{

const cc::AnimationCurve* curve = m_animation->curve();

DCHECK_EQ(cc::AnimationCurve::FLOAT, curve->Type());