Index: Source/core/animation/FilterStyleInterpolation.cpp |
diff --git a/Source/core/animation/FilterStyleInterpolation.cpp b/Source/core/animation/FilterStyleInterpolation.cpp |
index 4d063c0778be3836c2aaa044ddff34b0c15a65b7..909b3a328d89e2e8986fcb0011255f8cd5c0b90f 100644 |
--- a/Source/core/animation/FilterStyleInterpolation.cpp |
+++ b/Source/core/animation/FilterStyleInterpolation.cpp |
@@ -60,7 +60,7 @@ PassRefPtrWillBeRawPtr<CSSValueList> extendFilterList(const CSSValueList& shortF |
return result.release(); |
} |
-PassRefPtrWillBeRawPtr<FilterStyleInterpolation::FilterListStyleInterpolation> maybeCreateFromList(const CSSValueList& startList, const CSSValueList& endList, CSSPropertyID property) |
+FilterStyleInterpolation::FilterListStyleInterpolation* maybeCreateFromList(const CSSValueList& startList, const CSSValueList& endList, CSSPropertyID property) |
{ |
if (startList.length() < endList.length()) |
return ListStyleInterpolation<FilterStyleInterpolation>::maybeCreateFromList(*extendFilterList(startList, endList), endList, property); |
@@ -69,7 +69,7 @@ PassRefPtrWillBeRawPtr<FilterStyleInterpolation::FilterListStyleInterpolation> m |
} // namespace |
-PassRefPtrWillBeRawPtr<FilterStyleInterpolation::FilterListStyleInterpolation> FilterStyleInterpolation::maybeCreateList(const CSSValue& start, const CSSValue& end, CSSPropertyID property) |
+FilterStyleInterpolation::FilterListStyleInterpolation* FilterStyleInterpolation::maybeCreateList(const CSSValue& start, const CSSValue& end, CSSPropertyID property) |
{ |
if (start.isCSSWideKeyword() || end.isCSSWideKeyword()) |
return nullptr; |
@@ -97,13 +97,13 @@ bool FilterStyleInterpolation::canCreateFrom(const CSSValue& start, const CSSVal |
&& startFunctionType != CSSValueDropShadow; |
} |
-PassOwnPtrWillBeRawPtr<InterpolableValue> FilterStyleInterpolation::toInterpolableValue(const CSSValue& value, CSSValueID& functionType) |
+InterpolableValue* FilterStyleInterpolation::toInterpolableValue(const CSSValue& value, CSSValueID& functionType) |
{ |
const CSSFunctionValue& filterValue = toCSSFunctionValue(value); |
functionType = filterValue.functionType(); |
size_t length = filterValue.length(); |
- OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(length); |
+ InterpolableList* result = InterpolableList::create(length); |
for (size_t i = 0; i < length; ++i) { |
switch (functionType) { |
case CSSValueHueRotate: |
@@ -127,7 +127,7 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> FilterStyleInterpolation::toInterpolab |
ASSERT_NOT_REACHED(); |
} |
} |
- return result.release(); |
+ return result; |
} |
PassRefPtrWillBeRawPtr<CSSFunctionValue> FilterStyleInterpolation::fromInterpolableValue(const InterpolableValue& value, CSSValueID functionType, InterpolationRange) |