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

Source/core/css/CSSCalculationValueTest.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 51 matching lines @@
     EXPECT_EQ(expectedPercent, value.percent);
 }
 
 void initLengthArray(CSSLengthArray& lengthArray)
 {
     lengthArray.resize(CSSPrimitiveValue::LengthUnitTypeCount);
     for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; ++i)
         lengthArray.at(i) = 0;
 }
 
-CSSLengthArray& setLengthArray(CSSLengthArray& lengthArray, String text)
+void initLengthTypeArray(CSSLengthTypeArray& lengthTypeArray)
+{
+    lengthTypeArray.resize(CSSPrimitiveValue::LengthUnitTypeCount);
+    for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; ++i)
+        lengthTypeArray.clear(i);
+}
+
+CSSLengthArray& setLengthArray(CSSLengthArray& lengthArray, CSSLengthTypeArray& lengthTypeArray, String text)
 {
     initLengthArray(lengthArray);
+    initLengthTypeArray(lengthTypeArray);
     RefPtrWillBeRawPtr<MutableStylePropertySet> propertySet = MutableStylePropertySet::create();
     propertySet->setProperty(CSSPropertyLeft, text);
-    toCSSPrimitiveValue(propertySet->getPropertyCSSValue(CSSPropertyLeft).get())->accumulateLengthArray(lengthArray);
+    toCSSPrimitiveValue(propertySet->getPropertyCSSValue(CSSPropertyLeft).get())->accumulateLengthArray(lengthArray, lengthTypeArray);
     return lengthArray;
 }
 
 bool lengthArraysEqual(CSSLengthArray& a, CSSLengthArray& b)
 {
     for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; ++i) {
         if (a.at(i) != b.at(i))
             return false;
     }
     return true;
@@ skipping 76 matching lines @@
         lengthD = lengthA;
     EXPECT_EQ(calc->refCount(), 5);
 
     lengthD = Length();
     EXPECT_EQ(calc->refCount(), 4);
 }
 
 TEST(CSSCalculationValue, AddToLengthUnitValues)
 {
     CSSLengthArray expectation, actual;
+    CSSLengthTypeArray expectedType, actualType;
     initLengthArray(expectation);
-    EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "0")));
+    initLengthTypeArray(expectedType);

[samli, 2014/12/22 03:38:04]

Not actually used. Remove once you add the extra accumulateLengthArray.

[evemj (not active), 2014/12/22 06:09:05]

Done.

+    EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, actualType, "0")));
 
     expectation.at(CSSPrimitiveValue::UnitTypePixels) = 10;
-    EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "10px")));
+    EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, actualType, "10px")));
 
     expectation.at(CSSPrimitiveValue::UnitTypePixels) = 0;
     expectation.at(CSSPrimitiveValue::UnitTypePercentage) = 20;
-    EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "20%")));
+    EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, actualType, "20%")));
 
     expectation.at(CSSPrimitiveValue::UnitTypePixels) = 30;
     expectation.at(CSSPrimitiveValue::UnitTypePercentage) = -40;
-    EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc(30px - 40%)")));
+    EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, actualType, "calc(30px - 40%)")));
 
     expectation.at(CSSPrimitiveValue::UnitTypePixels) = 90;
     expectation.at(CSSPrimitiveValue::UnitTypePercentage) = 10;
-    EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc(1in + 10% - 6px)")));
+    EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, actualType, "calc(1in + 10% - 6px)")));
 
     expectation.at(CSSPrimitiveValue::UnitTypePixels) = 15;
     expectation.at(CSSPrimitiveValue::UnitTypeFontSize) = 20;
     expectation.at(CSSPrimitiveValue::UnitTypePercentage) = -40;
-    EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc((1 * 2) * (5px + 20em / 2) - 80% / (3 - 1) + 5px)")));
+    EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, actualType, "calc((1 * 2) * (5px + 20em / 2) - 80% / (3 - 1) + 5px)")));
 }
 
 }