| Index: third_party/WebKit/Source/core/animation/SVGNumberListInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/SVGNumberListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/SVGNumberListInterpolationType.cpp
|
| index 4eaa1e74d11bda62241e728dfb1c2ca0575dcfda..c3f26cf27a38e5c9780cc1c7ab13ce3798cc6dc0 100644
|
| --- a/third_party/WebKit/Source/core/animation/SVGNumberListInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/SVGNumberListInterpolationType.cpp
|
| @@ -7,6 +7,7 @@
|
| #include "core/animation/InterpolationEnvironment.h"
|
| #include "core/animation/UnderlyingLengthChecker.h"
|
| #include "core/svg/SVGNumberList.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -18,7 +19,7 @@ InterpolationValue SVGNumberListInterpolationType::maybeConvertNeutral(const Int
|
| if (underlyingLength == 0)
|
| return nullptr;
|
|
|
| - OwnPtr<InterpolableList> result = InterpolableList::create(underlyingLength);
|
| + std::unique_ptr<InterpolableList> result = InterpolableList::create(underlyingLength);
|
| for (size_t i = 0; i < underlyingLength; i++)
|
| result->set(i, InterpolableNumber::create(0));
|
| return InterpolationValue(std::move(result));
|
| @@ -30,7 +31,7 @@ InterpolationValue SVGNumberListInterpolationType::maybeConvertSVGValue(const SV
|
| return nullptr;
|
|
|
| const SVGNumberList& numberList = toSVGNumberList(svgValue);
|
| - OwnPtr<InterpolableList> result = InterpolableList::create(numberList.length());
|
| + std::unique_ptr<InterpolableList> result = InterpolableList::create(numberList.length());
|
| for (size_t i = 0; i < numberList.length(); i++)
|
| result->set(i, InterpolableNumber::create(numberList.at(i)->value()));
|
| return InterpolationValue(std::move(result));
|
| @@ -45,14 +46,14 @@ PairwiseInterpolationValue SVGNumberListInterpolationType::maybeMergeSingles(Int
|
| return InterpolationType::maybeMergeSingles(std::move(start), std::move(end));
|
| }
|
|
|
| -static void padWithZeroes(OwnPtr<InterpolableValue>& listPointer, size_t paddedLength)
|
| +static void padWithZeroes(std::unique_ptr<InterpolableValue>& listPointer, size_t paddedLength)
|
| {
|
| InterpolableList& list = toInterpolableList(*listPointer);
|
|
|
| if (list.length() >= paddedLength)
|
| return;
|
|
|
| - OwnPtr<InterpolableList> result = InterpolableList::create(paddedLength);
|
| + std::unique_ptr<InterpolableList> result = InterpolableList::create(paddedLength);
|
| size_t i = 0;
|
| for (; i < list.length(); i++)
|
| result->set(i, std::move(list.getMutable(i)));
|
|
|