Index: third_party/WebKit/Source/core/animation/CSSBorderImageLengthBoxInterpolationType.cpp |
diff --git a/third_party/WebKit/Source/core/animation/CSSBorderImageLengthBoxInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSBorderImageLengthBoxInterpolationType.cpp |
index e3247cc714a3d5967a264f832e8d35ad9c1605f6..3ff1615dd05ac73ed280312b5c208ca78d9967a0 100644 |
--- a/third_party/WebKit/Source/core/animation/CSSBorderImageLengthBoxInterpolationType.cpp |
+++ b/third_party/WebKit/Source/core/animation/CSSBorderImageLengthBoxInterpolationType.cpp |
@@ -8,6 +8,8 @@ |
#include "core/animation/CSSLengthInterpolationType.h" |
#include "core/css/CSSQuadValue.h" |
#include "core/css/resolver/StyleResolverState.h" |
+#include "wtf/PtrUtil.h" |
+#include <memory> |
namespace blink { |
@@ -84,9 +86,9 @@ namespace { |
class UnderlyingSideNumbersChecker : public InterpolationType::ConversionChecker { |
public: |
- static PassOwnPtr<UnderlyingSideNumbersChecker> create(const SideNumbers& underlyingSideNumbers) |
+ static std::unique_ptr<UnderlyingSideNumbersChecker> create(const SideNumbers& underlyingSideNumbers) |
{ |
- return adoptPtr(new UnderlyingSideNumbersChecker(underlyingSideNumbers)); |
+ return wrapUnique(new UnderlyingSideNumbersChecker(underlyingSideNumbers)); |
} |
static SideNumbers getUnderlyingSideNumbers(const InterpolationValue& underlying) |
@@ -109,9 +111,9 @@ private: |
class InheritedSideNumbersChecker : public InterpolationType::ConversionChecker { |
public: |
- static PassOwnPtr<InheritedSideNumbersChecker> create(CSSPropertyID property, const SideNumbers& inheritedSideNumbers) |
+ static std::unique_ptr<InheritedSideNumbersChecker> create(CSSPropertyID property, const SideNumbers& inheritedSideNumbers) |
{ |
- return adoptPtr(new InheritedSideNumbersChecker(property, inheritedSideNumbers)); |
+ return wrapUnique(new InheritedSideNumbersChecker(property, inheritedSideNumbers)); |
} |
private: |
@@ -131,7 +133,7 @@ private: |
InterpolationValue convertBorderImageLengthBox(const BorderImageLengthBox& box, double zoom) |
{ |
- OwnPtr<InterpolableList> list = InterpolableList::create(SideIndexCount); |
+ std::unique_ptr<InterpolableList> list = InterpolableList::create(SideIndexCount); |
Vector<RefPtr<NonInterpolableValue>> nonInterpolableValues(SideIndexCount); |
const BorderImageLength* sides[SideIndexCount] = {}; |
sides[SideTop] = &box.top(); |
@@ -191,7 +193,7 @@ InterpolationValue CSSBorderImageLengthBoxInterpolationType::maybeConvertValue(c |
return nullptr; |
const CSSQuadValue& quad = toCSSQuadValue(value); |
- OwnPtr<InterpolableList> list = InterpolableList::create(SideIndexCount); |
+ std::unique_ptr<InterpolableList> list = InterpolableList::create(SideIndexCount); |
Vector<RefPtr<NonInterpolableValue>> nonInterpolableValues(SideIndexCount); |
const CSSPrimitiveValue* sides[SideIndexCount] = {}; |
sides[SideTop] = quad.top(); |