Index: third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp |
diff --git a/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp |
index 761c7c3ac89de1d75c98367a0f6b38164e18df2b..42879225a91130140b20f5412f6d9acc761066e6 100644 |
--- a/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp |
+++ b/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp |
@@ -403,16 +403,6 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import |
validPrimitive = validUnit(value, FLength | FNonNeg | unitless); |
break; |
- case CSSPropertyVerticalAlign: |
- // baseline | sub | super | top | text-top | middle | bottom | text-bottom | |
- // <percentage> | <length> | inherit |
- |
- if (id >= CSSValueBaseline && id <= CSSValueWebkitBaselineMiddle) |
- validPrimitive = true; |
- else |
- validPrimitive = validUnit(value, FLength | FPercent | FUnitlessQuirk); |
- break; |
- |
case CSSPropertyBottom: // <length> | <percentage> | auto | inherit |
case CSSPropertyLeft: // <length> | <percentage> | auto | inherit |
case CSSPropertyRight: // <length> | <percentage> | auto | inherit |
@@ -423,12 +413,6 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import |
validPrimitive = validUnit(value, FLength | FPercent | FUnitlessQuirk); |
break; |
- case CSSPropertyTextUnderlinePosition: |
- // auto | [ under || [ left | right ] ], but we only support auto | under for now |
- ASSERT(RuntimeEnabledFeatures::css3TextDecorationsEnabled()); |
- validPrimitive = (id == CSSValueAuto || id == CSSValueUnder); |
- break; |
- |
case CSSPropertySrc: |
case CSSPropertyUnicodeRange: |
/* @font-face only descriptors */ |
@@ -493,17 +477,6 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import |
ASSERT(RuntimeEnabledFeatures::cssFontSizeAdjustEnabled()); |
validPrimitive = (id == CSSValueNone) ? true : validUnit(value, FNumber | FNonNeg); |
break; |
- case CSSPropertyOpacity: |
- case CSSPropertyWebkitBoxFlex: |
- validPrimitive = validUnit(value, FNumber); |
- break; |
- case CSSPropertyWebkitBoxFlexGroup: |
- validPrimitive = validUnit(value, FInteger | FNonNeg); |
- break; |
- case CSSPropertyOrder: |
- validPrimitive = validUnit(value, FInteger); |
- break; |
- |
case CSSPropertyJustifyContent: |
ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled()); |
parsedValue = parseContentDistributionOverflowPosition(); |
@@ -821,6 +794,8 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import |
case CSSPropertyFillOpacity: |
case CSSPropertyStopOpacity: |
case CSSPropertyFloodOpacity: |
+ case CSSPropertyOpacity: |
+ case CSSPropertyWebkitBoxFlex: |
case CSSPropertyBaselineShift: |
case CSSPropertyStrokeMiterlimit: |
case CSSPropertyStrokeWidth: |
@@ -849,6 +824,10 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import |
case CSSPropertyBorderBottomRightRadius: |
case CSSPropertyBorderRadius: |
case CSSPropertyAliasWebkitBorderRadius: |
+ case CSSPropertyWebkitBoxFlexGroup: |
+ case CSSPropertyOrder: |
+ case CSSPropertyTextUnderlinePosition: |
+ case CSSPropertyVerticalAlign: |
validPrimitive = false; |
break; |