calc expressions should support time, angle and frequency values.

Source/core/css/CSSPrimitiveValue.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 125 matching lines @@
     table.set(String("dpi"), CSSPrimitiveValue::CSS_DPI);
     table.set(String("dpcm"), CSSPrimitiveValue::CSS_DPCM);
     table.set(String("dppx"), CSSPrimitiveValue::CSS_DPPX);
     table.set(String("vw"), CSSPrimitiveValue::CSS_VW);
     table.set(String("vh"), CSSPrimitiveValue::CSS_VH);
     table.set(String("vmax"), CSSPrimitiveValue::CSS_VMIN);
     table.set(String("vmin"), CSSPrimitiveValue::CSS_VMAX);
     return table;
 }
 
+CSSPrimitiveValue::UnitType CSSPrimitiveValue::calcUnitType() const
+{
+    CSSCalcExpressionNode* calcExpressionNode = cssCalcValue()->expressionNode();
+    if (calcExpressionNode)
+        return calcExpressionNode->primitiveType();
+    return CSS_UNKNOWN;

[alancutter (OOO until 2018), 2014/07/21 14:03:47]

This function should only get called if we are a calc so the null check can be
skipped. We'd rather catch bugs early via crashes than to let the program get
into an error state that's hard to debug.
Without the null check this function would be a single line and can probably
just be inlined in the two places it gets used.

+}
 
 CSSPrimitiveValue::UnitType CSSPrimitiveValue::fromName(const String& unit)
 {
     DEFINE_STATIC_LOCAL(StringToUnitTable, unitTable, (createStringToUnitTable()));
     return unitTable.get(unit.lower());
 }
 
 CSSPrimitiveValue::UnitCategory CSSPrimitiveValue::unitCategory(UnitType type)
 {
     // Here we violate the spec (http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSPrimitiveValue) and allow conversions
@@ skipping 53 matching lines @@
 
 CSSPrimitiveValue::UnitType CSSPrimitiveValue::primitiveType() const
 {
     if (m_primitiveUnitType == CSS_PROPERTY_ID || m_primitiveUnitType == CSS_VALUE_ID)
         return CSS_IDENT;
 
     if (m_primitiveUnitType != CSS_CALC)
         return static_cast<UnitType>(m_primitiveUnitType);
 
     switch (m_value.calc->category()) {
+    case CalcAngle:
+        return CSS_DEG;
+    case CalcFrequency:
+        return CSS_HZ;
     case CalcNumber:
         return CSS_NUMBER;
     case CalcPercent:
         return CSS_PERCENTAGE;
     case CalcLength:
         return CSS_PX;
     case CalcPercentNumber:
         return CSS_CALC_PERCENTAGE_WITH_NUMBER;
     case CalcPercentLength:
         return CSS_CALC_PERCENTAGE_WITH_LENGTH;
+    case CalcTime:
+        return CSS_MS;
     case CalcOther:
         return CSS_UNKNOWN;
     }
     return CSS_UNKNOWN;
 }
 
 static const AtomicString& propertyName(CSSPropertyID propertyID)
 {
     ASSERT_ARG(propertyID, propertyID >= 0);
     ASSERT_ARG(propertyID, (propertyID >= firstCSSProperty && propertyID < firstCSSProperty + numCSSProperties));
@@ skipping 288 matching lines @@
     case CSS_VALUE_ID:
         break;
     }
     m_primitiveUnitType = 0;
     if (m_hasCachedCSSText) {
         cssTextCache().remove(this);
         m_hasCachedCSSText = false;
     }
 }
 
+double CSSPrimitiveValue::computeSeconds()
+{
+    ASSERT(isTime() || (isCalculated() && cssCalcValue()->category() == CalcTime));
+    UnitType currentType = isCalculated() ? calcUnitType() : static_cast<UnitType>(m_primitiveUnitType);
+    if (currentType == CSS_S)
+        return getDoubleValue();
+    if (currentType == CSS_MS)
+        return getDoubleValue() / 1000;
+    ASSERT_NOT_REACHED();
+    return 0;
+}
+
 double CSSPrimitiveValue::computeDegrees()
 {
-    switch (m_primitiveUnitType) {
+    ASSERT(isAngle() || (isCalculated() && cssCalcValue()->category() == CalcAngle));
+    UnitType currentType = isCalculated() ? calcUnitType() : static_cast<UnitType>(m_primitiveUnitType);
+    switch (currentType) {
     case CSS_DEG:
         return getDoubleValue();
     case CSS_RAD:
         return rad2deg(getDoubleValue());
     case CSS_GRAD:
         return grad2deg(getDoubleValue());
     case CSS_TURN:
         return turn2deg(getDoubleValue());
     default:
         ASSERT_NOT_REACHED();
@@ skipping 882 matching lines @@
     case CSS_SHAPE:
         visitor->trace(m_value.shape);
         break;
     default:
         break;
     }
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace WebCore