Index: Source/core/css/CSSPrimitiveValue.cpp |
diff --git a/Source/core/css/CSSPrimitiveValue.cpp b/Source/core/css/CSSPrimitiveValue.cpp |
index 97497512b54f0998dcdb5db4aa75bc3e921d1921..80585ab17b212717e412c39a059525bc26b562c7 100644 |
--- a/Source/core/css/CSSPrimitiveValue.cpp |
+++ b/Source/core/css/CSSPrimitiveValue.cpp |
@@ -216,6 +216,10 @@ CSSPrimitiveValue::UnitType CSSPrimitiveValue::primitiveType() const |
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: |
@@ -226,6 +230,8 @@ CSSPrimitiveValue::UnitType CSSPrimitiveValue::primitiveType() const |
return CSS_CALC_PERCENTAGE_WITH_NUMBER; |
case CalcPercentLength: |
return CSS_CALC_PERCENTAGE_WITH_LENGTH; |
+ case CalcTime: |
+ return CSS_MS; |
case CalcOther: |
return CSS_UNKNOWN; |
} |
@@ -545,6 +551,8 @@ double CSSPrimitiveValue::computeDegrees() |
return grad2deg(getDoubleValue()); |
case CSS_TURN: |
return turn2deg(getDoubleValue()); |
+ case CSS_CALC: |
alancutter (OOO until 2018)
2014/07/02 05:56:10
Similar comments as for computeTime(), this should
|
+ return getDoubleValue(); |
default: |
ASSERT_NOT_REACHED(); |
return 0; |