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

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

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

index 23c64f433dc0d3137b35e8518d1ec6eae62c55af..02f60d857e04e5fce3ba2d1a992e03cf8a7ea4b8 100644

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

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

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

#include "core/CSSValueKeywords.h"

#include "core/animation/CSSInterpolationType.h"

#include "platform/graphics/Color.h"

-#include <memory>

namespace blink {

@@ -23,10 +22,10 @@ public:

InterpolationValue maybeConvertUnderlyingValue(const InterpolationEnvironment&) const final;

void apply(const InterpolableValue&, const NonInterpolableValue*, InterpolationEnvironment&) const final;

- static std::unique_ptr<InterpolableValue> createInterpolableColor(const Color&);

- static std::unique_ptr<InterpolableValue> createInterpolableColor(CSSValueID);

- static std::unique_ptr<InterpolableValue> createInterpolableColor(const StyleColor&);

- static std::unique_ptr<InterpolableValue> maybeCreateInterpolableColor(const CSSValue&);

+ static PassOwnPtr<InterpolableValue> createInterpolableColor(const Color&);

+ static PassOwnPtr<InterpolableValue> createInterpolableColor(CSSValueID);

+ static PassOwnPtr<InterpolableValue> createInterpolableColor(const StyleColor&);

+ static PassOwnPtr<InterpolableValue> maybeCreateInterpolableColor(const CSSValue&);

static Color resolveInterpolableColor(const InterpolableValue& interpolableColor, const StyleResolverState&, bool isVisited = false, bool isTextDecoration = false);

private: