| Index: Source/core/css/CSSGrammar.y
|
| diff --git a/Source/core/css/CSSGrammar.y b/Source/core/css/CSSGrammar.y
|
| index 3de382c15d70a4316eac0b3cf9d297287ab1beab..2ba70d46128966c3256ba8a03c21595c62f3c606 100644
|
| --- a/Source/core/css/CSSGrammar.y
|
| +++ b/Source/core/css/CSSGrammar.y
|
| @@ -195,7 +195,6 @@ inline static CSSParserValue makeIdentValue(CSSParserString string)
|
| %token INTERNAL_SUPPORTS_CONDITION_SYM
|
| %token KEYFRAMES_SYM
|
| %token WEBKIT_KEYFRAMES_SYM
|
| -%token WEBKIT_REGION_RULE_SYM
|
| %token <marginBox> TOPLEFTCORNER_SYM
|
| %token <marginBox> TOPLEFT_SYM
|
| %token <marginBox> TOPCENTER_SYM
|
| @@ -288,13 +287,8 @@ inline static CSSParserValue makeIdentValue(CSSParserString string)
|
| %type <rule> valid_rule
|
| %type <ruleList> block_rule_body
|
| %type <ruleList> block_rule_list
|
| -%type <ruleList> region_block_rule_body
|
| -%type <ruleList> region_block_rule_list
|
| %type <rule> block_rule
|
| %type <rule> block_valid_rule
|
| -%type <rule> region_block_rule
|
| -%type <rule> region_block_valid_rule
|
| -%type <rule> region
|
| %type <rule> supports
|
| %type <rule> viewport
|
| %type <boolean> keyframes_rule_start
|
| @@ -342,7 +336,6 @@ inline static CSSParserValue makeIdentValue(CSSParserString string)
|
| %type <selector> relative_selector
|
| %type <selectorList> selector_list
|
| %type <selectorList> simple_selector_list
|
| -%type <selectorList> region_selector
|
| %type <selector> class
|
| %type <selector> attrib
|
| %type <selector> pseudo
|
| @@ -512,7 +505,6 @@ valid_rule:
|
| | keyframes
|
| | namespace
|
| | import
|
| - | region
|
| | supports
|
| | viewport
|
| ;
|
| @@ -547,45 +539,12 @@ block_rule_list:
|
| }
|
| ;
|
|
|
| -region_block_rule_body:
|
| - region_block_rule_list
|
| - | region_block_rule_list block_rule_recovery
|
| - ;
|
| -
|
| -region_block_rule_list:
|
| - /* empty */ { $$ = 0; }
|
| - | region_block_rule_list region_block_rule maybe_sgml {
|
| - $$ = parser->appendRule($1, $2);
|
| - }
|
| - ;
|
| -
|
| -region_block_rule:
|
| - before_rule region_block_valid_rule {
|
| - $$ = $2;
|
| - parser->endRule(!!$$);
|
| - }
|
| - | before_rule invalid_rule {
|
| - $$ = 0;
|
| - parser->endRule(false);
|
| - }
|
| - ;
|
| -
|
| block_rule_recovery:
|
| before_rule invalid_rule_header {
|
| parser->endRule(false);
|
| }
|
| ;
|
|
|
| -region_block_valid_rule:
|
| - ruleset
|
| - | page
|
| - | font_face
|
| - | media
|
| - | keyframes
|
| - | supports
|
| - | viewport
|
| - ;
|
| -
|
| block_valid_rule:
|
| ruleset
|
| | page
|
| @@ -595,7 +554,6 @@ block_valid_rule:
|
| | supports
|
| | viewport
|
| | namespace
|
| - | region
|
| ;
|
|
|
| block_rule:
|
| @@ -1087,25 +1045,6 @@ viewport:
|
| }
|
| ;
|
|
|
| -region_selector:
|
| - selector_list {
|
| - parser->setReusableRegionSelectorVector($1);
|
| - $$ = parser->reusableRegionSelectorVector();
|
| - }
|
| -;
|
| -
|
| -before_region_rule:
|
| - /* empty */ {
|
| - parser->startRuleHeader(CSSRuleSourceData::REGION_RULE);
|
| - }
|
| - ;
|
| -
|
| -region:
|
| - before_region_rule WEBKIT_REGION_RULE_SYM maybe_space region_selector at_rule_header_end '{' at_rule_body_start maybe_space region_block_rule_body closing_brace {
|
| - $$ = parser->createRegionRule($4, $9);
|
| - }
|
| -;
|
| -
|
| combinator:
|
| '+' maybe_space { $$ = CSSSelector::DirectAdjacent; }
|
| | '~' maybe_space { $$ = CSSSelector::IndirectAdjacent; }
|
| @@ -1916,7 +1855,6 @@ regular_invalid_at_rule_header:
|
| }
|
| | import_rule_start at_rule_header_recovery
|
| | NAMESPACE_SYM at_rule_header_recovery
|
| - | before_region_rule WEBKIT_REGION_RULE_SYM at_rule_header_recovery
|
| | error_location invalid_at at_rule_header_recovery {
|
| parser->resumeErrorLogging();
|
| parser->reportError($1, InvalidRuleCSSError);
|
|
|