Index: Source/core/animation/LengthStyleInterpolation.cpp |
diff --git a/Source/core/animation/LengthStyleInterpolation.cpp b/Source/core/animation/LengthStyleInterpolation.cpp |
index d787920217ef9d839ce155f08b13e25067dfd03e..1c82be458b9df1f2dc87a23582e573bb3a16b754 100644 |
--- a/Source/core/animation/LengthStyleInterpolation.cpp |
+++ b/Source/core/animation/LengthStyleInterpolation.cpp |
@@ -69,12 +69,12 @@ bool LengthStyleInterpolation::canCreateFrom(const CSSValue& value, CSSPropertyI |
return primitiveValue.isLength() || primitiveValue.isPercentage() || primitiveValue.isCalculatedPercentageWithLength(); |
} |
-PassOwnPtrWillBeRawPtr<InterpolableValue> LengthStyleInterpolation::toInterpolableValue(const CSSValue& value, CSSPropertyID id) |
+InterpolableValue* LengthStyleInterpolation::toInterpolableValue(const CSSValue& value, CSSPropertyID id) |
{ |
ASSERT(canCreateFrom(value, id)); |
- OwnPtrWillBeRawPtr<InterpolableList> listOfValuesAndTypes = InterpolableList::create(2); |
- OwnPtrWillBeRawPtr<InterpolableList> listOfValues = InterpolableList::create(CSSPrimitiveValue::LengthUnitTypeCount); |
- OwnPtrWillBeRawPtr<InterpolableList> listOfTypes = InterpolableList::create(CSSPrimitiveValue::LengthUnitTypeCount); |
+ InterpolableList* listOfValuesAndTypes = InterpolableList::create(2); |
+ InterpolableList* listOfValues = InterpolableList::create(CSSPrimitiveValue::LengthUnitTypeCount); |
+ InterpolableList* listOfTypes = InterpolableList::create(CSSPrimitiveValue::LengthUnitTypeCount); |
const CSSPrimitiveValue& primitive = toCSSPrimitiveValue(value); |
@@ -99,10 +99,10 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> LengthStyleInterpolation::toInterpolab |
listOfTypes->set(i, InterpolableNumber::create(arrayOfTypes.get(i))); |
} |
- listOfValuesAndTypes->set(0, listOfValues.release()); |
- listOfValuesAndTypes->set(1, listOfTypes.release()); |
+ listOfValuesAndTypes->set(0, listOfValues); |
+ listOfValuesAndTypes->set(1, listOfTypes); |
- return listOfValuesAndTypes.release(); |
+ return listOfValuesAndTypes; |
} |
bool LengthStyleInterpolation::isPixelsOrPercentOnly(const InterpolableValue& value) |
@@ -315,9 +315,9 @@ void LengthStyleInterpolation::applyInterpolableValue(CSSPropertyID property, co |
if (lengthSetter && isPixelsOrPercentOnly(value)) { |
(state.style()->*lengthSetter)(lengthFromInterpolableValue(value, range, state.style()->effectiveZoom())); |
#if ENABLE(ASSERT) |
- RefPtrWillBeRawPtr<AnimatableValue> before = CSSAnimatableValueFactory::create(property, *state.style()); |
+ AnimatableValue* before = CSSAnimatableValueFactory::create(property, *state.style()); |
StyleBuilder::applyProperty(property, state, fromInterpolableValue(value, range).get()); |
- RefPtrWillBeRawPtr<AnimatableValue> after = CSSAnimatableValueFactory::create(property, *state.style()); |
+ AnimatableValue* after = CSSAnimatableValueFactory::create(property, *state.style()); |
ASSERT(before->equals(*after)); |
#endif |
} else { |