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

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

Issue 1305383006: Oilpan: Unship CSSValues and AnimatableValues Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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 d787920217ef9d839ce155f08b13e25067dfd03e..e1dd937d98efdc98556bb1dae53a0b73a00db827 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)
+PassOwnPtr<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);
+ OwnPtr<InterpolableList> listOfValuesAndTypes = InterpolableList::create(2);
+ OwnPtr<InterpolableList> listOfValues = InterpolableList::create(CSSPrimitiveValue::LengthUnitTypeCount);
+ OwnPtr<InterpolableList> listOfTypes = InterpolableList::create(CSSPrimitiveValue::LengthUnitTypeCount);
const CSSPrimitiveValue& primitive = toCSSPrimitiveValue(value);
@@ -226,17 +226,17 @@ static CSSPrimitiveValue::UnitType toUnitType(int lengthUnitType)
return static_cast<CSSPrimitiveValue::UnitType>(CSSPrimitiveValue::lengthUnitTypeToUnitType(static_cast<CSSPrimitiveValue::LengthUnitType>(lengthUnitType)));
}
-static PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> constructCalcExpression(const InterpolableList* list)
+static PassRefPtr<CSSCalcExpressionNode> constructCalcExpression(const InterpolableList* list)
{
const InterpolableList* listOfValues = toInterpolableList(list->get(0));
const InterpolableList* listOfTypes = toInterpolableList(list->get(1));
- RefPtrWillBeRawPtr<CSSCalcExpressionNode> expression = nullptr;
+ RefPtr<CSSCalcExpressionNode> expression = nullptr;
for (size_t position = 0; position < CSSPrimitiveValue::LengthUnitTypeCount; position++) {
const InterpolableNumber *subValueType = toInterpolableNumber(listOfTypes->get(position));
if (!subValueType->value())
continue;
double value = toInterpolableNumber(listOfValues->get(position))->value();
- RefPtrWillBeRawPtr<CSSCalcExpressionNode> currentTerm = CSSCalcValue::createExpressionNode(CSSPrimitiveValue::create(value, toUnitType(position)));
+ RefPtr<CSSCalcExpressionNode> currentTerm = CSSCalcValue::createExpressionNode(CSSPrimitiveValue::create(value, toUnitType(position)));
if (expression)
expression = CSSCalcValue::createExpressionNode(expression.release(), currentTerm.release(), CalcAdd);
else
@@ -276,7 +276,7 @@ static Length lengthFromInterpolableValue(const InterpolableValue& value, Interp
}
-PassRefPtrWillBeRawPtr<CSSPrimitiveValue> LengthStyleInterpolation::fromInterpolableValue(const InterpolableValue& value, InterpolationRange range)
+PassRefPtr<CSSPrimitiveValue> LengthStyleInterpolation::fromInterpolableValue(const InterpolableValue& value, InterpolationRange range)
{
const InterpolableList* listOfValuesAndTypes = toInterpolableList(&value);
const InterpolableList* listOfValues = toInterpolableList(listOfValuesAndTypes->get(0));
@@ -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());
+ RefPtr<AnimatableValue> before = CSSAnimatableValueFactory::create(property, *state.style());
StyleBuilder::applyProperty(property, state, fromInterpolableValue(value, range).get());
- RefPtrWillBeRawPtr<AnimatableValue> after = CSSAnimatableValueFactory::create(property, *state.style());
+ RefPtr<AnimatableValue> after = CSSAnimatableValueFactory::create(property, *state.style());
ASSERT(before->equals(*after));
#endif
} else {
« no previous file with comments | « Source/core/animation/LengthStyleInterpolation.h ('k') | Source/core/animation/LengthStyleInterpolationTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698