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

Unified Diff: Source/core/animation/LengthStyleInterpolation.cpp

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Resize expect size of Persistent Created 5 years, 7 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: Source/core/animation/LengthStyleInterpolation.cpp
diff --git a/Source/core/animation/LengthStyleInterpolation.cpp b/Source/core/animation/LengthStyleInterpolation.cpp
index c4a1fff45ec77ada63f937f95d614497d8ea3b0d..2c4811a8631b0f0f2daba4471be75abd6b875fe4 100644
--- a/Source/core/animation/LengthStyleInterpolation.cpp
+++ b/Source/core/animation/LengthStyleInterpolation.cpp
@@ -71,12 +71,12 @@ bool LengthStyleInterpolation::canCreateFrom(const CSSValue& value, CSSPropertyI
return value.isCalcValue();
}
-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);
@@ -101,10 +101,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)
@@ -317,9 +317,9 @@ void LengthStyleInterpolation::apply(StyleResolverState& state) const
if (m_lengthSetter) {
(state.style()->*m_lengthSetter)(lengthFromInterpolableValue(*m_cachedValue, m_range, state.style()->effectiveZoom()));
#if ENABLE(ASSERT)
- RefPtrWillBeRawPtr<AnimatableValue> before = CSSAnimatableValueFactory::create(m_id, *state.style());
+ AnimatableValue* before = CSSAnimatableValueFactory::create(m_id, *state.style());
StyleBuilder::applyProperty(m_id, state, fromInterpolableValue(*m_cachedValue, m_range).get());
- RefPtrWillBeRawPtr<AnimatableValue> after = CSSAnimatableValueFactory::create(m_id, *state.style());
+ AnimatableValue* after = CSSAnimatableValueFactory::create(m_id, *state.style());
ASSERT(before->equals(*after));
#endif
} else {

Powered by Google App Engine
This is Rietveld 408576698