Animation: Fix loss of type information when interpolating value of 0

Source/core/css/CSSCalculationValue.cpp

 /*
  * Copyright (C) 2011, 2012 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 235 matching lines @@
         case CalcPercentNumber:
         case CalcTime:
         case CalcOther:
             ASSERT_NOT_REACHED();
             break;
         }
         ASSERT_NOT_REACHED();
         return 0;
     }
 
-    virtual void accumulateLengthArray(CSSLengthArray& lengthArray, double multiplier) const override
+    virtual void accumulateLengthArray(CSSLengthArray& lengthArray, CSSLengthTypeArray& lengthTypeArray, double multiplier) const override
     {
         ASSERT(category() != CalcNumber);
-        m_value->accumulateLengthArray(lengthArray, multiplier);
+        m_value->accumulateLengthArray(lengthArray, lengthTypeArray, multiplier);
     }
 
     virtual bool equals(const CSSCalcExpressionNode& other) const override
     {
         if (type() != other.type())
             return false;
 
         return compareCSSValuePtr(m_value, static_cast<const CSSCalcPrimitiveValue&>(other).m_value);
     }
 
@@ skipping 172 matching lines @@
         return evaluate(m_leftSide->doubleValue(), m_rightSide->doubleValue());
     }
 
     virtual double computeLengthPx(const CSSToLengthConversionData& conversionData) const override
     {
         const double leftValue = m_leftSide->computeLengthPx(conversionData);
         const double rightValue = m_rightSide->computeLengthPx(conversionData);
         return evaluate(leftValue, rightValue);
     }
 
-    virtual void accumulateLengthArray(CSSLengthArray& lengthArray, double multiplier) const override
+    virtual void accumulateLengthArray(CSSLengthArray& lengthArray, CSSLengthTypeArray& lengthTypeArray, double multiplier) const override
     {
         switch (m_operator) {
         case CalcAdd:
-            m_leftSide->accumulateLengthArray(lengthArray, multiplier);
-            m_rightSide->accumulateLengthArray(lengthArray, multiplier);
+            m_leftSide->accumulateLengthArray(lengthArray, lengthTypeArray, multiplier);
+            m_rightSide->accumulateLengthArray(lengthArray, lengthTypeArray, multiplier);
             break;
         case CalcSubtract:
-            m_leftSide->accumulateLengthArray(lengthArray, multiplier);
-            m_rightSide->accumulateLengthArray(lengthArray, -multiplier);
+            m_leftSide->accumulateLengthArray(lengthArray, lengthTypeArray, multiplier);
+            m_rightSide->accumulateLengthArray(lengthArray, lengthTypeArray, -multiplier);
             break;
         case CalcMultiply:
             ASSERT((m_leftSide->category() == CalcNumber) != (m_rightSide->category() == CalcNumber));
             if (m_leftSide->category() == CalcNumber)
-                m_rightSide->accumulateLengthArray(lengthArray, multiplier * m_leftSide->doubleValue());
+                m_rightSide->accumulateLengthArray(lengthArray, lengthTypeArray, multiplier * m_leftSide->doubleValue());
             else
-                m_leftSide->accumulateLengthArray(lengthArray, multiplier * m_rightSide->doubleValue());
+                m_leftSide->accumulateLengthArray(lengthArray, lengthTypeArray, multiplier * m_rightSide->doubleValue());
             break;
         case CalcDivide:
             ASSERT(m_rightSide->category() == CalcNumber);
-            m_leftSide->accumulateLengthArray(lengthArray, multiplier / m_rightSide->doubleValue());
+            m_leftSide->accumulateLengthArray(lengthArray, lengthTypeArray, multiplier / m_rightSide->doubleValue());
             break;
         default:
             ASSERT_NOT_REACHED();
         }
     }
 
     static String buildCSSText(const String& leftExpression, const String& rightExpression, CalcOperator op)
     {
         StringBuilder result;
         result.append('(');
@@ skipping 278 matching lines @@
     return adoptRefWillBeNoop(new CSSCalcValue(expression, range));
 }
 
 void CSSCalcValue::traceAfterDispatch(Visitor* visitor)
 {
     visitor->trace(m_expression);
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink