Index: third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h |
diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h |
index 8b77bf66c25ff3de80ddb3239bb30274b2b9d74a..96ed6c5e3497c14b3272122a3e6892261d375bf8 100644 |
--- a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h |
+++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h |
@@ -184,22 +184,16 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ColumnSpan columnSpan) |
template<> inline ColumnSpan CSSPrimitiveValue::convertTo() const |
{ |
- // Map 1 to none for compatibility reasons. |
- if (type() == UnitType::Integer && m_value.num == 1) |
- return ColumnSpanNone; |
- |
ASSERT(isValueID()); |
switch (m_value.valueID) { |
case CSSValueAll: |
return ColumnSpanAll; |
+ default: |
+ ASSERT_NOT_REACHED(); |
+ // fall-through |
case CSSValueNone: |
return ColumnSpanNone; |
- default: |
- break; |
} |
- |
- ASSERT_NOT_REACHED(); |
- return ColumnSpanNone; |
} |