Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 90c0168b1231163333d0fafca258885fc86565c9..d18b6ee05be1abf2af14f4842d4a91fcc2daccf4 100644
--- a/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp
@@ -10,8 +10,6 @@
#include "core/css/CSSPrimitiveValue.h"
#include "core/css/CSSValueList.h"
#include "core/css/resolver/StyleResolverState.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
namespace blink {
@@ -19,9 +17,9 @@ class UnderlyingImageListChecker : public InterpolationType::ConversionChecker {
public:
~UnderlyingImageListChecker() final {}
- static std::unique_ptr<UnderlyingImageListChecker> create(const InterpolationValue& underlying)
+ static PassOwnPtr<UnderlyingImageListChecker> create(const InterpolationValue& underlying)
{
- return wrapUnique(new UnderlyingImageListChecker(underlying));
+ return adoptPtr(new UnderlyingImageListChecker(underlying));
}
private:
@@ -64,9 +62,9 @@ class ParentImageListChecker : public InterpolationType::ConversionChecker {
public:
~ParentImageListChecker() final {}
- static std::unique_ptr<ParentImageListChecker> create(CSSPropertyID property, const StyleImageList& inheritedImageList)
+ static PassOwnPtr<ParentImageListChecker> create(CSSPropertyID property, const StyleImageList& inheritedImageList)
{
- return wrapUnique(new ParentImageListChecker(property, inheritedImageList));
+ return adoptPtr(new ParentImageListChecker(property, inheritedImageList));
}
private:
@@ -110,7 +108,7 @@ InterpolationValue CSSImageListInterpolationType::maybeConvertValue(const CSSVal
const CSSValueList& valueList = tempList ? *tempList : toCSSValueList(value);
const size_t length = valueList.length();
- std::unique_ptr<InterpolableList> interpolableList = InterpolableList::create(length);
+ OwnPtr<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);

Powered by Google App Engine
This is Rietveld 408576698