Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp |
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp |
index f653367a9146144491af6745df1a8f55260438ea..81d1232091f1d8c732f64ea999645b472d40d31d 100644 |
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp |
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp |
@@ -1484,17 +1484,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> consumeColumnGap(CSSParserTokenRange& ra |
static PassRefPtrWillBeRawPtr<CSSValue> consumeColumnSpan(CSSParserTokenRange& range, CSSParserMode cssParserMode) |
{ |
- CSSValueID id = range.peek().id(); |
- if (id == CSSValueAll || id == CSSValueNone) |
- return consumeIdent(range); |
- if (range.peek().type() != NumberToken) |
- return nullptr; |
- if (RefPtrWillBeRawPtr<CSSPrimitiveValue> spanValue = consumeInteger(range)) { |
- // 1 (will be dropped in the unprefixed property). |
- if (spanValue->getIntValue() == 1) |
- return spanValue.release(); |
- } |
- return nullptr; |
+ return consumeIdent<CSSValueAll, CSSValueNone>(range); |
} |
static PassRefPtrWillBeRawPtr<CSSValue> consumeZoom(CSSParserTokenRange& range, const CSSParserContext& context) |