third_party/WebKit/Source/core/animation/PairwiseInterpolationValue.h - 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/core/animation/PairwiseInterpolationValue.h

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

Index: third_party/WebKit/Source/core/animation/PairwiseInterpolationValue.h

diff --git a/third_party/WebKit/Source/core/animation/PairwiseInterpolationValue.h b/third_party/WebKit/Source/core/animation/PairwiseInterpolationValue.h

index bc63e054da3677f44a251b6a3b73d937efdd6541..6f1d96c2efb10e5debc536a87a52c564737b6b70 100644

--- a/third_party/WebKit/Source/core/animation/PairwiseInterpolationValue.h

+++ b/third_party/WebKit/Source/core/animation/PairwiseInterpolationValue.h

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

#include "core/animation/InterpolableValue.h"

#include "core/animation/NonInterpolableValue.h"

#include "platform/heap/Handle.h"

-#include <memory>

namespace blink {

@@ -16,7 +15,7 @@ namespace blink {

struct PairwiseInterpolationValue {

DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();

- PairwiseInterpolationValue(std::unique_ptr<InterpolableValue> startInterpolableValue, std::unique_ptr<InterpolableValue> endInterpolableValue, PassRefPtr<NonInterpolableValue> nonInterpolableValue = nullptr)

+ PairwiseInterpolationValue(PassOwnPtr<InterpolableValue> startInterpolableValue, PassOwnPtr<InterpolableValue> endInterpolableValue, PassRefPtr<NonInterpolableValue> nonInterpolableValue = nullptr)

: startInterpolableValue(std::move(startInterpolableValue))

, endInterpolableValue(std::move(endInterpolableValue))

, nonInterpolableValue(std::move(nonInterpolableValue))

@@ -32,8 +31,8 @@ struct PairwiseInterpolationValue {

operator bool() const { return startInterpolableValue.get(); }

- std::unique_ptr<InterpolableValue> startInterpolableValue;

- std::unique_ptr<InterpolableValue> endInterpolableValue;

+ OwnPtr<InterpolableValue> startInterpolableValue;

+ OwnPtr<InterpolableValue> endInterpolableValue;

RefPtr<NonInterpolableValue> nonInterpolableValue;

};