Generate toCSSCalcValue() instead of using manual inline functions

Source/core/animation/AnimatableNumber.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 34 matching lines @@
         CSSPrimitiveValue* primitiveValue = WebCore::toCSSPrimitiveValue(value);
         const CSSCalcValue* calcValue = primitiveValue->cssCalcValue();
         if (calcValue)
             return create(calcValue->expressionNode(), primitiveValue);
         NumberUnitType unitType = primitiveUnitToNumberType(primitiveValue->primitiveType());
         ASSERT(unitType != UnitTypeInvalid);
         const double scale = CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor(primitiveValue->primitiveType());
         return create(primitiveValue->getDoubleValue() * scale, unitType, primitiveValue);
     }
 
-    if (value->isCalculationValue())
+    if (value->isCalcValue())
         return create(toCSSCalcValue(value)->expressionNode());
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 PassRefPtr<AnimatableNumber> AnimatableNumber::create(const AnimatableNumber* leftAddend, const AnimatableNumber* rightAddend)
 {
     ASSERT(leftAddend);
     ASSERT(rightAddend);
 
     if (!leftAddend->m_isCalc && !rightAddend->m_isCalc && leftAddend->m_unitType == rightAddend->m_unitType)
         return create(leftAddend->m_number + rightAddend->m_number, leftAddend->m_unitType);
     return create(CSSCalcValue::createExpressionNode(leftAddend->toCSSCalcExpressionNode(), rightAddend->toCSSCalcExpressionNode(), CalcAdd));
 }
 
 bool AnimatableNumber::canCreateFrom(const CSSValue* value)
 {
     ASSERT(value);
     if (value->isPrimitiveValue()) {
         const CSSPrimitiveValue* primitiveValue = WebCore::toCSSPrimitiveValue(value);
         if (primitiveValue->cssCalcValue())
             return true;
         return primitiveUnitToNumberType(primitiveValue->primitiveType()) != UnitTypeInvalid;
     }
-    return value->isCalculationValue();
+    return value->isCalcValue();
 }
 
 PassRefPtr<CSSValue> AnimatableNumber::toCSSValue(NumberRange range) const
 {
     return toCSSPrimitiveValue(range);
 }
 
 double AnimatableNumber::toDouble() const
 {
     ASSERT(m_unitType == UnitTypeNumber);
@@ skipping 150 matching lines @@
     case UnitTypeResolution:
         return CSSPrimitiveValue::CSS_DPPX;
     case UnitTypeInvalid:
         return CSSPrimitiveValue::CSS_UNKNOWN;
     }
     ASSERT_NOT_REACHED();
     return CSSPrimitiveValue::CSS_UNKNOWN;
 }
 
 } // namespace WebCore