| Index: sky/engine/core/css/parser/BisonCSSParser-in.cpp
|
| diff --git a/sky/engine/core/css/parser/BisonCSSParser-in.cpp b/sky/engine/core/css/parser/BisonCSSParser-in.cpp
|
| index 9611f016b659958aedf81ec46af44628897c18b6..6c962ddaa2b3adc7f13a3d6e3935c745ebacddf3 100644
|
| --- a/sky/engine/core/css/parser/BisonCSSParser-in.cpp
|
| +++ b/sky/engine/core/css/parser/BisonCSSParser-in.cpp
|
| @@ -39,8 +39,6 @@
|
| #include "core/css/CSSFontFeatureValue.h"
|
| #include "core/css/CSSFunctionValue.h"
|
| #include "core/css/CSSGradientValue.h"
|
| -#include "core/css/CSSGridLineNamesValue.h"
|
| -#include "core/css/CSSGridTemplateAreasValue.h"
|
| #include "core/css/CSSImageSetValue.h"
|
| #include "core/css/CSSImageValue.h"
|
| #include "core/css/CSSInheritedValue.h"
|
| @@ -378,9 +376,8 @@ bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, CSSValueID valueID
|
| // inline | block | list-item | inline-block | table |
|
| // inline-table | table-row-group | table-header-group | table-footer-group | table-row |
|
| // table-column-group | table-column | table-cell | table-caption | -webkit-box | -webkit-inline-box | none
|
| - // flex | inline-flex | -webkit-flex | -webkit-inline-flex | grid | inline-grid
|
| - return (valueID >= CSSValueInline && valueID <= CSSValueInlineFlex) || valueID == CSSValueWebkitFlex || valueID == CSSValueWebkitInlineFlex || valueID == CSSValueNone
|
| - || (RuntimeEnabledFeatures::cssGridLayoutEnabled() && (valueID == CSSValueGrid || valueID == CSSValueInlineGrid));
|
| + // flex | inline-flex
|
| + return (valueID >= CSSValueInline && valueID <= CSSValueInlineFlex) || valueID == CSSValueNone;
|
| case CSSPropertyEmptyCells: // show | hide
|
| return valueID == CSSValueShow || valueID == CSSValueHide;
|
| case CSSPropertyFloat: // left | right | none | center (for buggy CSS, maps to none)
|
| @@ -520,6 +517,8 @@ bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, CSSValueID valueID
|
| bool isKeywordPropertyID(CSSPropertyID propertyId)
|
| {
|
| switch (propertyId) {
|
| + case CSSPropertyAlignItems:
|
| + case CSSPropertyAlignSelf:
|
| case CSSPropertyAll:
|
| case CSSPropertyMixBlendMode:
|
| case CSSPropertyIsolation:
|
| @@ -593,9 +592,6 @@ bool isKeywordPropertyID(CSSPropertyID propertyId)
|
| case CSSPropertyWordBreak:
|
| case CSSPropertyWordWrap:
|
| return true;
|
| - case CSSPropertyAlignItems:
|
| - case CSSPropertyAlignSelf:
|
| - return !RuntimeEnabledFeatures::cssGridLayoutEnabled();
|
| default:
|
| return false;
|
| }
|
|
|