| Index: Source/core/animation/DoubleStyleInterpolation.cpp
|
| diff --git a/Source/core/animation/DoubleStyleInterpolation.cpp b/Source/core/animation/DoubleStyleInterpolation.cpp
|
| index ad1989e06916a0225d1e66a0b3aa83a554848849..44e5a4729fa5a926afd718108d96688ff7553b76 100644
|
| --- a/Source/core/animation/DoubleStyleInterpolation.cpp
|
| +++ b/Source/core/animation/DoubleStyleInterpolation.cpp
|
| @@ -27,7 +27,7 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> DoubleStyleInterpolation::doubleToInte
|
| return nullptr;
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> DoubleStyleInterpolation::interpolableValueToDouble(InterpolableValue* value, bool isNumber, InterpolationRange clamp)
|
| +CSSValue DoubleStyleInterpolation::interpolableValueToDouble(InterpolableValue* value, bool isNumber, InterpolationRange clamp)
|
| {
|
| ASSERT(value->isNumber());
|
| double doubleValue = toInterpolableNumber(value)->value();
|
| @@ -68,11 +68,11 @@ PassRefPtrWillBeRawPtr<CSSValue> DoubleStyleInterpolation::interpolableValueToDo
|
| void DoubleStyleInterpolation::apply(StyleResolverState& state) const
|
| {
|
| if (m_id != CSSPropertyMotionRotation) {
|
| - StyleBuilder::applyProperty(m_id, state, interpolableValueToDouble(m_cachedValue.get(), m_isNumber, m_clamp).get());
|
| + StyleBuilder::applyProperty(m_id, state, interpolableValueToDouble(m_cachedValue.get(), m_isNumber, m_clamp));
|
| return;
|
| }
|
|
|
| - StyleBuilder::applyProperty(m_id, state, interpolableValueToMotionRotation(m_cachedValue.get(), m_flag).get());
|
| + StyleBuilder::applyProperty(m_id, state, interpolableValueToMotionRotation(m_cachedValue.get(), m_flag));
|
| }
|
|
|
| DEFINE_TRACE(DoubleStyleInterpolation)
|
| @@ -93,17 +93,17 @@ bool extractMotionRotation(const CSSValue& value, float* rotation, MotionRotatio
|
|
|
| int len = list.length();
|
| for (int i = 0; i < len; i++) {
|
| - const CSSValue* item = list.item(i);
|
| - if (!item->isPrimitiveValue())
|
| + const CSSValue item = list.item(i);
|
| + if (!item.isPrimitiveValue())
|
| return false;
|
| - const CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(item);
|
| - if (primitiveValue->getValueID() == CSSValueAuto) {
|
| + const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(item);
|
| + if (primitiveValue.getValueID() == CSSValueAuto) {
|
| *rotationType = MotionRotationAuto;
|
| - } else if (primitiveValue->getValueID() == CSSValueReverse) {
|
| + } else if (primitiveValue.getValueID() == CSSValueReverse) {
|
| *rotationType = MotionRotationAuto;
|
| *rotation += 180;
|
| - } else if (primitiveValue->isAngle() || primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_DEG) {
|
| - *rotation += primitiveValue->computeDegrees();
|
| + } else if (primitiveValue.isAngle() || primitiveValue.primitiveType() == CSSPrimitiveValue::CSS_DEG) {
|
| + *rotation += primitiveValue.computeDegrees();
|
| } else {
|
| return false;
|
| }
|
| @@ -113,7 +113,7 @@ bool extractMotionRotation(const CSSValue& value, float* rotation, MotionRotatio
|
|
|
| } // namespace
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> DoubleStyleInterpolation::interpolableValueToMotionRotation(InterpolableValue* value, bool flag)
|
| +CSSValue DoubleStyleInterpolation::interpolableValueToMotionRotation(InterpolableValue* value, bool flag)
|
| {
|
| RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| if (flag)
|
|
|