Index: third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp |
diff --git a/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp |
index d18b6ee05be1abf2af14f4842d4a91fcc2daccf4..90c0168b1231163333d0fafca258885fc86565c9 100644 |
--- a/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp |
+++ b/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp |
@@ -10,6 +10,8 @@ |
#include "core/css/CSSPrimitiveValue.h" |
#include "core/css/CSSValueList.h" |
#include "core/css/resolver/StyleResolverState.h" |
+#include "wtf/PtrUtil.h" |
+#include <memory> |
namespace blink { |
@@ -17,9 +19,9 @@ class UnderlyingImageListChecker : public InterpolationType::ConversionChecker { |
public: |
~UnderlyingImageListChecker() final {} |
- static PassOwnPtr<UnderlyingImageListChecker> create(const InterpolationValue& underlying) |
+ static std::unique_ptr<UnderlyingImageListChecker> create(const InterpolationValue& underlying) |
{ |
- return adoptPtr(new UnderlyingImageListChecker(underlying)); |
+ return wrapUnique(new UnderlyingImageListChecker(underlying)); |
} |
private: |
@@ -62,9 +64,9 @@ class ParentImageListChecker : public InterpolationType::ConversionChecker { |
public: |
~ParentImageListChecker() final {} |
- static PassOwnPtr<ParentImageListChecker> create(CSSPropertyID property, const StyleImageList& inheritedImageList) |
+ static std::unique_ptr<ParentImageListChecker> create(CSSPropertyID property, const StyleImageList& inheritedImageList) |
{ |
- return adoptPtr(new ParentImageListChecker(property, inheritedImageList)); |
+ return wrapUnique(new ParentImageListChecker(property, inheritedImageList)); |
} |
private: |
@@ -108,7 +110,7 @@ InterpolationValue CSSImageListInterpolationType::maybeConvertValue(const CSSVal |
const CSSValueList& valueList = tempList ? *tempList : toCSSValueList(value); |
const size_t length = valueList.length(); |
- 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 component = CSSImageInterpolationType::maybeConvertCSSValue(valueList.item(i), false); |