| Index: third_party/WebKit/Source/core/animation/CSSScaleInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSScaleInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSScaleInterpolationType.cpp
|
| index 69b9128cc06cc0fee51f60d9b7d74c31acdf9ffc..40b9819fd34b77c27a0a67cc49a3d1fe582a5c8e 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSScaleInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSScaleInterpolationType.cpp
|
| @@ -42,7 +42,7 @@ struct Scale {
|
| OwnPtr<InterpolableList> result = InterpolableList::create(3);
|
| for (size_t i = 0; i < 3; i++)
|
| result->set(i, InterpolableNumber::create(array[i]));
|
| - return result.release();
|
| + return static_pointer_cast<InterpolableValue>(std::move(result));
|
| }
|
|
|
| bool operator==(const Scale& other) const
|
| @@ -169,8 +169,8 @@ InterpolationValue CSSScaleInterpolationType::maybeConvertSingle(const PropertyS
|
| PairwiseInterpolationValue CSSScaleInterpolationType::maybeMergeSingles(InterpolationValue&& start, InterpolationValue&& end) const
|
| {
|
| return PairwiseInterpolationValue(
|
| - start.interpolableValue.release(),
|
| - end.interpolableValue.release(),
|
| + std::move(start.interpolableValue),
|
| + std::move(end.interpolableValue),
|
| CSSScaleNonInterpolableValue::merge(
|
| toCSSScaleNonInterpolableValue(*start.nonInterpolableValue),
|
| toCSSScaleNonInterpolableValue(*end.nonInterpolableValue)));
|
|
|