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

Unified Diff: third_party/WebKit/Source/core/animation/CSSFilterListInterpolationType.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/CSSFilterListInterpolationType.cpp
diff --git a/third_party/WebKit/Source/core/animation/CSSFilterListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSFilterListInterpolationType.cpp
index 7e28a0ee73a5433f369dd4b15e73cbccbfad6d7b..7ddefa2aaee829fe17fece6efee5f3c94342148e 100644
--- a/third_party/WebKit/Source/core/animation/CSSFilterListInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSFilterListInterpolationType.cpp
@@ -9,8 +9,6 @@
#include "core/animation/ListInterpolationFunctions.h"
#include "core/css/CSSValueList.h"
#include "core/css/resolver/StyleResolverState.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
namespace blink {
@@ -18,9 +16,9 @@ namespace {
class UnderlyingFilterListChecker : public InterpolationType::ConversionChecker {
public:
- static std::unique_ptr<UnderlyingFilterListChecker> create(PassRefPtr<NonInterpolableList> nonInterpolableList)
+ static PassOwnPtr<UnderlyingFilterListChecker> create(PassRefPtr<NonInterpolableList> nonInterpolableList)
{
- return wrapUnique(new UnderlyingFilterListChecker(nonInterpolableList));
+ return adoptPtr(new UnderlyingFilterListChecker(nonInterpolableList));
}
bool isValid(const InterpolationEnvironment&, const InterpolationValue& underlying) const final
@@ -45,9 +43,9 @@ private:
class InheritedFilterListChecker : public InterpolationType::ConversionChecker {
public:
- static std::unique_ptr<InheritedFilterListChecker> create(CSSPropertyID property, const FilterOperations& filterOperations)
+ static PassOwnPtr<InheritedFilterListChecker> create(CSSPropertyID property, const FilterOperations& filterOperations)
{
- return wrapUnique(new InheritedFilterListChecker(property, filterOperations));
+ return adoptPtr(new InheritedFilterListChecker(property, filterOperations));
}
bool isValid(const InterpolationEnvironment& environment, const InterpolationValue&) const final
@@ -69,7 +67,7 @@ private:
InterpolationValue convertFilterList(const FilterOperations& filterOperations, double zoom)
{
size_t length = filterOperations.size();
- 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 filterResult = FilterInterpolationFunctions::maybeConvertFilter(*filterOperations.operations()[i], zoom);
@@ -113,7 +111,7 @@ InterpolationValue CSSFilterListInterpolationType::maybeConvertValue(const CSSVa
const CSSValueList& list = toCSSValueList(value);
size_t length = list.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 itemResult = FilterInterpolationFunctions::maybeConvertCSSFilter(list.item(i));
@@ -153,7 +151,7 @@ PairwiseInterpolationValue CSSFilterListInterpolationType::maybeMergeSingles(Int
size_t longerLength = toNonInterpolableList(*longer.nonInterpolableValue).length();
InterpolableList& shorterInterpolableList = toInterpolableList(*shorter.interpolableValue);
const NonInterpolableList& longerNonInterpolableList = toNonInterpolableList(*longer.nonInterpolableValue);
- std::unique_ptr<InterpolableList> extendedInterpolableList = InterpolableList::create(longerLength);
+ OwnPtr<InterpolableList> extendedInterpolableList = InterpolableList::create(longerLength);
for (size_t i = 0; i < longerLength; i++) {
if (i < shorterLength)
extendedInterpolableList->set(i, std::move(shorterInterpolableList.getMutable(i)));
@@ -190,7 +188,7 @@ void CSSFilterListInterpolationType::composite(UnderlyingValueOwner& underlyingV
if (length <= underlyingLength)
return;
- std::unique_ptr<InterpolableList> extendedInterpolableList = InterpolableList::create(length);
+ OwnPtr<InterpolableList> extendedInterpolableList = InterpolableList::create(length);
for (size_t i = 0; i < length; i++) {
if (i < underlyingLength)
extendedInterpolableList->set(i, std::move(underlyingInterpolableList.getMutable(i)));

Powered by Google App Engine
This is Rietveld 408576698