Index: Source/core/css/CSSCalculationValue.cpp |
diff --git a/Source/core/css/CSSCalculationValue.cpp b/Source/core/css/CSSCalculationValue.cpp |
index e27cba3a66db7d1722794fe52a7a0ceb7ee51532..3a25524752583cd6dac8c68de7208c6044b17273 100644 |
--- a/Source/core/css/CSSCalculationValue.cpp |
+++ b/Source/core/css/CSSCalculationValue.cpp |
@@ -65,6 +65,10 @@ static CalculationCategory unitCategory(CSSPrimitiveValue::UnitTypes type) |
case CSSPrimitiveValue::CSS_PC: |
case CSSPrimitiveValue::CSS_REMS: |
case CSSPrimitiveValue::CSS_CHS: |
+ case CSSPrimitiveValue::CSS_VW: |
+ case CSSPrimitiveValue::CSS_VH: |
+ case CSSPrimitiveValue::CSS_VMIN: |
+ case CSSPrimitiveValue::CSS_VMAX: |
return CalcLength; |
case CSSPrimitiveValue::CSS_VARIABLE_NAME: |
return CalcVariable; |
@@ -746,10 +750,6 @@ PassRefPtr<CSSCalcExpressionNode> CSSCalcValue::createExpressionNode(const Lengt |
{ |
switch (length.type()) { |
case Percent: |
- case ViewportPercentageWidth: |
- case ViewportPercentageHeight: |
- case ViewportPercentageMin: |
- case ViewportPercentageMax: |
case Fixed: |
return createExpressionNode(CSSPrimitiveValue::create(length, zoom), length.value() == trunc(length.value())); |
case Calculated: |
@@ -762,6 +762,8 @@ PassRefPtr<CSSCalcExpressionNode> CSSCalcValue::createExpressionNode(const Lengt |
case FillAvailable: |
case FitContent: |
case ExtendToZoom: |
+ case DeviceWidth: |
kenneth.r.christiansen
2013/12/16 10:08:19
same
|
+ case DeviceHeight: |
case Undefined: |
ASSERT_NOT_REACHED(); |
return 0; |