Index: Source/core/animation/LengthSVGInterpolation.cpp |
diff --git a/Source/core/animation/LengthSVGInterpolation.cpp b/Source/core/animation/LengthSVGInterpolation.cpp |
index 35e1e3107ca84c16158e943271a138d91f8faca0..c021d7e70711fe1859284351d5cefc66b9443769 100644 |
--- a/Source/core/animation/LengthSVGInterpolation.cpp |
+++ b/Source/core/animation/LengthSVGInterpolation.cpp |
@@ -21,12 +21,12 @@ PassRefPtrWillBeRawPtr<SVGLengthList> LengthSVGInterpolation::createList(const S |
return SVGLengthList::create(animatedLengthList.currentValue()->unitMode()); |
} |
-PassRefPtrWillBeRawPtr<LengthSVGInterpolation> LengthSVGInterpolation::create(SVGPropertyBase* start, SVGPropertyBase* end, PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase> attribute) |
+LengthSVGInterpolation* LengthSVGInterpolation::create(SVGPropertyBase* start, SVGPropertyBase* end, PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase> attribute) |
{ |
NonInterpolableType modeData; |
- OwnPtrWillBeRawPtr<InterpolableValue> startValue = toInterpolableValue(toSVGLength(start).get(), attribute.get(), &modeData); |
- OwnPtrWillBeRawPtr<InterpolableValue> endValue = toInterpolableValue(toSVGLength(end).get(), attribute.get(), nullptr); |
- return adoptRefWillBeNoop(new LengthSVGInterpolation(startValue.release(), endValue.release(), attribute, modeData)); |
+ InterpolableValue* startValue = toInterpolableValue(toSVGLength(start).get(), attribute.get(), &modeData); |
+ InterpolableValue* endValue = toInterpolableValue(toSVGLength(end).get(), attribute.get(), nullptr); |
+ return new LengthSVGInterpolation(startValue, endValue, attribute, modeData); |
} |
namespace { |
@@ -103,7 +103,7 @@ LengthInterpolatedUnit convertToInterpolatedUnit(SVGLengthType lengthType, doubl |
} // namespace |
-PassOwnPtrWillBeRawPtr<InterpolableValue> LengthSVGInterpolation::toInterpolableValue(SVGLength* length, const SVGAnimatedPropertyBase* attribute, NonInterpolableType* ptrModeData) |
+InterpolableValue* LengthSVGInterpolation::toInterpolableValue(SVGLength* length, const SVGAnimatedPropertyBase* attribute, NonInterpolableType* ptrModeData) |
{ |
if (ptrModeData) |
populateModeData(attribute, ptrModeData); |
@@ -114,10 +114,10 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> LengthSVGInterpolation::toInterpolable |
double values[numLengthInterpolatedUnits] = { }; |
values[unitType] = value; |
- OwnPtrWillBeRawPtr<InterpolableList> listOfValues = InterpolableList::create(numLengthInterpolatedUnits); |
+ InterpolableList* listOfValues = InterpolableList::create(numLengthInterpolatedUnits); |
for (size_t i = 0; i < numLengthInterpolatedUnits; ++i) |
listOfValues->set(i, InterpolableNumber::create(values[i])); |
- return listOfValues.release(); |
+ return listOfValues; |
} |
PassRefPtrWillBeRawPtr<SVGLength> LengthSVGInterpolation::fromInterpolableValue(const InterpolableValue& interpolableValue, const NonInterpolableType& modeData, const SVGElement* element) |