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

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

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

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

index b80dd09f7402f8fe95d6167d55f5c17809ac9a59..57764dca263bd84eae3f6bbcf08c69691f6315df 100644

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

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

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

#include "core/animation/InterpolationValue.h"

#include "core/animation/PairwiseInterpolationValue.h"

#include "wtf/Vector.h"

+#include <memory>

namespace blink {

@@ -28,7 +29,7 @@ public:

static bool equalValues(const InterpolationValue&, const InterpolationValue&, EqualNonInterpolableValuesCallback);

using NonInterpolableValuesAreCompatibleCallback = bool (*)(const NonInterpolableValue*, const NonInterpolableValue*);

- using CompositeItemCallback = void (*)(OwnPtr<InterpolableValue>&, RefPtr<NonInterpolableValue>&, double underlyingFraction, const InterpolableValue&, const NonInterpolableValue*);

+ using CompositeItemCallback = void (*)(std::unique_ptr<InterpolableValue>&, RefPtr<NonInterpolableValue>&, double underlyingFraction, const InterpolableValue&, const NonInterpolableValue*);

static void composite(UnderlyingValueOwner&, double underlyingFraction, const InterpolationType&, const InterpolationValue&, NonInterpolableValuesAreCompatibleCallback, CompositeItemCallback);

};

@@ -69,7 +70,7 @@ InterpolationValue ListInterpolationFunctions::createList(size_t length, CreateI

{

if (length == 0)

return createEmptyList();

- OwnPtr<InterpolableList> interpolableList = InterpolableList::create(length);

+ std::unique_ptr<InterpolableList> interpolableList = InterpolableList::create(length);

Vector<RefPtr<NonInterpolableValue>> nonInterpolableValues(length);

for (size_t i = 0; i < length; i++) {

InterpolationValue item = createItem(i);