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

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

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

index 56e72167f2bdbcfcb6448ddc7157e7cea8a09c11..584aa2a089ad3e8a43cf63565ee839b320bd3e2a 100644

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

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

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

#include "core/animation/InterpolationValue.h"

#include "core/animation/PairwiseInterpolationValue.h"

-#include <memory>

namespace blink {

@@ -19,10 +18,10 @@ class ShadowInterpolationFunctions {

public:

static InterpolationValue convertShadowData(const ShadowData&, double zoom);

static InterpolationValue maybeConvertCSSValue(const CSSValue&);

- static std::unique_ptr<InterpolableValue> createNeutralInterpolableValue();

+ static PassOwnPtr<InterpolableValue> createNeutralInterpolableValue();

static bool nonInterpolableValuesAreCompatible(const NonInterpolableValue*, const NonInterpolableValue*);

static PairwiseInterpolationValue maybeMergeSingles(InterpolationValue&& start, InterpolationValue&& end);

- static void composite(std::unique_ptr<InterpolableValue>&, RefPtr<NonInterpolableValue>&, double underlyingFraction, const InterpolableValue&, const NonInterpolableValue*);

+ static void composite(OwnPtr<InterpolableValue>&, RefPtr<NonInterpolableValue>&, double underlyingFraction, const InterpolableValue&, const NonInterpolableValue*);

static ShadowData createShadowData(const InterpolableValue&, const NonInterpolableValue*, const StyleResolverState&);

};