| 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 aa30b74edac99a047ff1c1d1eb0896ab0d20f2e5..846ea2e57a90e02aca89e471fb59b7226d677472 100644
|
| --- a/third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp
|
| +++ b/third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp
|
| @@ -40,6 +40,22 @@ static inline bool IsSimpleLengthPropertyID(CSSPropertyID property_id,
|
| case CSSPropertyPaddingLeft:
|
| case CSSPropertyPaddingRight:
|
| case CSSPropertyPaddingTop:
|
| + case CSSPropertyScrollPaddingTop:
|
| + case CSSPropertyScrollPaddingRight:
|
| + case CSSPropertyScrollPaddingBottom:
|
| + case CSSPropertyScrollPaddingLeft:
|
| + case CSSPropertyScrollPaddingBlockStart:
|
| + case CSSPropertyScrollPaddingBlockEnd:
|
| + case CSSPropertyScrollPaddingInlineStart:
|
| + case CSSPropertyScrollPaddingInlineEnd:
|
| + case CSSPropertyScrollSnapMarginTop:
|
| + case CSSPropertyScrollSnapMarginRight:
|
| + case CSSPropertyScrollSnapMarginBottom:
|
| + case CSSPropertyScrollSnapMarginLeft:
|
| + case CSSPropertyScrollSnapMarginBlockStart:
|
| + case CSSPropertyScrollSnapMarginBlockEnd:
|
| + case CSSPropertyScrollSnapMarginInlineStart:
|
| + case CSSPropertyScrollSnapMarginInlineEnd:
|
| case CSSPropertyWebkitLogicalWidth:
|
| case CSSPropertyWebkitLogicalHeight:
|
| case CSSPropertyWebkitMinLogicalWidth:
|
| @@ -841,10 +857,8 @@ bool CSSParserFastPaths::IsValidKeywordPropertyAndValue(
|
| case CSSPropertyWordBreak:
|
| return value_id == CSSValueNormal || value_id == CSSValueBreakAll ||
|
| value_id == CSSValueKeepAll || value_id == CSSValueBreakWord;
|
| - case CSSPropertyScrollSnapType:
|
| - DCHECK(RuntimeEnabledFeatures::cssScrollSnapPointsEnabled());
|
| - return value_id == CSSValueNone || value_id == CSSValueMandatory ||
|
| - value_id == CSSValueProximity;
|
| + case CSSPropertyScrollSnapStop:
|
| + return value_id == CSSValueNormal || value_id == CSSValueAlways;
|
| default:
|
| NOTREACHED();
|
| return false;
|
| @@ -957,7 +971,7 @@ bool CSSParserFastPaths::IsKeywordPropertyID(CSSPropertyID property_id) {
|
| case CSSPropertyWordBreak:
|
| case CSSPropertyWordWrap:
|
| case CSSPropertyWritingMode:
|
| - case CSSPropertyScrollSnapType:
|
| + case CSSPropertyScrollSnapStop:
|
| return true;
|
| case CSSPropertyJustifyContent:
|
| case CSSPropertyAlignContent:
|
|
|