Index: third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp |
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp |
index 9104ecc3e786dfd4f28cbab3d52ec0a6fa1376ea..43f87bc3653ea505631db06c6275c4c7690f1f89 100644 |
--- a/third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp |
+++ b/third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp |
@@ -558,14 +558,11 @@ bool CSSParserFastPaths::isValidKeywordPropertyAndValue(CSSPropertyID propertyId |
return valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueScroll || valueID == CSSValueAuto || valueID == CSSValueOverlay; |
case CSSPropertyOverflowY: // visible | hidden | scroll | auto | overlay | -webkit-paged-x | -webkit-paged-y |
return valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueScroll || valueID == CSSValueAuto || valueID == CSSValueOverlay || valueID == CSSValueWebkitPagedX || valueID == CSSValueWebkitPagedY; |
- case CSSPropertyPageBreakAfter: // auto | always | avoid | left | right |
- case CSSPropertyPageBreakBefore: |
- case CSSPropertyWebkitColumnBreakAfter: |
- case CSSPropertyWebkitColumnBreakBefore: |
- return valueID == CSSValueAuto || valueID == CSSValueAlways || valueID == CSSValueAvoid || valueID == CSSValueLeft || valueID == CSSValueRight; |
- case CSSPropertyPageBreakInside: // avoid | auto |
- case CSSPropertyWebkitColumnBreakInside: |
- return valueID == CSSValueAuto || valueID == CSSValueAvoid; |
+ case CSSPropertyBreakAfter: // auto | avoid | always | any | avoid-page | page | left | right | recto | verso | avoid-column | column |
Timothy Loh
2016/02/18 06:25:45
I wouldn't add the comments.. we should probably r
mstensho (USE GERRIT)
2016/02/18 09:05:26
Yeah, I agree that they are pretty silly and usele
|
+ case CSSPropertyBreakBefore: |
+ return valueID == CSSValueAuto || valueID == CSSValueAvoid || valueID == CSSValueAvoidPage || valueID == CSSValuePage || valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueRecto || valueID == CSSValueVerso || valueID == CSSValueAvoidColumn || valueID == CSSValueColumn; |
+ case CSSPropertyBreakInside: // auto | avoid | avoid-page | avoid-column |
+ return valueID == CSSValueAuto || valueID == CSSValueAvoid || valueID == CSSValueAvoidPage || valueID == CSSValueAvoidColumn; |
case CSSPropertyPointerEvents: |
// none | visiblePainted | visibleFill | visibleStroke | visible | |
// painted | fill | stroke | auto | all | bounding-box |
@@ -756,9 +753,9 @@ bool CSSParserFastPaths::isKeywordPropertyID(CSSPropertyID propertyId) |
case CSSPropertyOverflowWrap: |
case CSSPropertyOverflowX: |
case CSSPropertyOverflowY: |
- case CSSPropertyPageBreakAfter: |
- case CSSPropertyPageBreakBefore: |
- case CSSPropertyPageBreakInside: |
+ case CSSPropertyBreakAfter: |
+ case CSSPropertyBreakBefore: |
+ case CSSPropertyBreakInside: |
case CSSPropertyPointerEvents: |
case CSSPropertyPosition: |
case CSSPropertyResize: |
@@ -795,9 +792,6 @@ bool CSSParserFastPaths::isKeywordPropertyID(CSSPropertyID propertyId) |
case CSSPropertyWebkitBoxLines: |
case CSSPropertyWebkitBoxOrient: |
case CSSPropertyWebkitBoxPack: |
- case CSSPropertyWebkitColumnBreakAfter: |
- case CSSPropertyWebkitColumnBreakBefore: |
- case CSSPropertyWebkitColumnBreakInside: |
case CSSPropertyColumnFill: |
case CSSPropertyWebkitColumnRuleStyle: |
case CSSPropertyFlexDirection: |