Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h

Issue 1635993002: Remove support for -webkit-column-span:1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code review. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;
}

Powered by Google App Engine
This is Rietveld 408576698