Remove special cases for viewport units, and add tests for viewport units in calc().

Source/core/animation/AnimatableLength.h

 /*
  * 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 49 matching lines @@
         return adoptRefWillBeNoop(new AnimatableLength(calcExpression, cssPrimitiveValue));
     }
     PassRefPtrWillBeRawPtr<CSSValue> toCSSValue(NumberRange = AllValues) const;
     Length toLength(const CSSToLengthConversionData&, NumberRange = AllValues) const;
 
     virtual void trace(Visitor*) OVERRIDE;
 
 protected:
     virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const OVERRIDE;
     virtual PassRefPtrWillBeRawPtr<AnimatableValue> addWith(const AnimatableValue*) const OVERRIDE;
-    virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVERRIDE;
 
 private:
     AnimatableLength(double number, CSSPrimitiveValue::LengthUnitType unitType, CSSPrimitiveValue* cssPrimitiveValue)
         : m_lengthValue(number)
         , m_lengthUnitType(unitType)
         , m_cachedCSSPrimitiveValue(cssPrimitiveValue)
     {
         ASSERT(!isCalc());
     }
     AnimatableLength(PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> calcExpression, CSSPrimitiveValue* cssPrimitiveValue)
         : m_lengthUnitType(CSSPrimitiveValue::UnitTypeCalc)
         , m_calcExpression(calcExpression)
         , m_cachedCSSPrimitiveValue(cssPrimitiveValue)
     {
         ASSERT(isCalc());
         ASSERT(m_calcExpression);
     }
     virtual AnimatableType type() const OVERRIDE { return TypeLength; }
     virtual bool equalTo(const AnimatableValue*) const OVERRIDE;
 
     static bool isCalc(CSSPrimitiveValue::LengthUnitType type) { return type == CSSPrimitiveValue::UnitTypeCalc; }
     bool isCalc() const { return isCalc(m_lengthUnitType); }
 
-    bool isViewportUnit() const
-    {
-        return m_lengthUnitType == CSSPrimitiveValue::UnitTypeViewportWidth
-            || m_lengthUnitType == CSSPrimitiveValue::UnitTypeViewportHeight
-            || m_lengthUnitType == CSSPrimitiveValue::UnitTypeViewportMin
-            || m_lengthUnitType == CSSPrimitiveValue::UnitTypeViewportMax;
-    }
-
     static PassRefPtrWillBeRawPtr<AnimatableLength> create(const AnimatableLength* leftAddend, const AnimatableLength* rightAddend)
     {
         ASSERT(leftAddend && rightAddend);
         return create(CSSCalcValue::createExpressionNode(leftAddend->toCSSCalcExpressionNode(), rightAddend->toCSSCalcExpressionNode(), CalcAdd));
     }
 
     PassRefPtrWillBeRawPtr<CSSPrimitiveValue> toCSSPrimitiveValue(NumberRange) const;
     PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> toCSSCalcExpressionNode() const;
 
     PassRefPtrWillBeRawPtr<AnimatableLength> scale(double) const;
@@ skipping 33 matching lines @@
 
     friend class AnimationAnimatableLengthTest;
     friend class LengthStyleInterpolation;
 };
 
 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableLength, isLength());
 
 } // namespace WebCore
 
 #endif // AnimatableLength_h