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/CSSPaintInterpolationType.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/CSSPaintInterpolationType.cpp
diff --git a/third_party/WebKit/Source/core/animation/CSSPaintInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSPaintInterpolationType.cpp
index 63b4938304a8ab7e4d726eddabd24cb71774a71f..33fb0e18335504b39d85f215b55abf74c5bf40a6 100644
--- a/third_party/WebKit/Source/core/animation/CSSPaintInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSPaintInterpolationType.cpp
@@ -7,8 +7,6 @@
#include "core/animation/CSSColorInterpolationType.h"
#include "core/animation/PaintPropertyFunctions.h"
#include "core/css/resolver/StyleResolverState.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
namespace blink {
@@ -27,13 +25,13 @@ InterpolationValue CSSPaintInterpolationType::maybeConvertInitial(const StyleRes
class ParentPaintChecker : public InterpolationType::ConversionChecker {
public:
- static std::unique_ptr<ParentPaintChecker> create(CSSPropertyID property, const StyleColor& color)
+ static PassOwnPtr<ParentPaintChecker> create(CSSPropertyID property, const StyleColor& color)
{
- return wrapUnique(new ParentPaintChecker(property, color));
+ return adoptPtr(new ParentPaintChecker(property, color));
}
- static std::unique_ptr<ParentPaintChecker> create(CSSPropertyID property)
+ static PassOwnPtr<ParentPaintChecker> create(CSSPropertyID property)
{
- return wrapUnique(new ParentPaintChecker(property));
+ return adoptPtr(new ParentPaintChecker(property));
}
private:
@@ -75,7 +73,7 @@ InterpolationValue CSSPaintInterpolationType::maybeConvertInherit(const StyleRes
InterpolationValue CSSPaintInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState&, ConversionCheckers&) const
{
- std::unique_ptr<InterpolableValue> interpolableColor = CSSColorInterpolationType::maybeCreateInterpolableColor(value);
+ OwnPtr<InterpolableValue> interpolableColor = CSSColorInterpolationType::maybeCreateInterpolableColor(value);
if (!interpolableColor)
return nullptr;
return InterpolationValue(std::move(interpolableColor));

Powered by Google App Engine
This is Rietveld 408576698