Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(327)

Side by Side Diff: Source/core/css/CSSGrammar.y.in

Issue 16646002: Move the CSS Device Adaptation @viewport rule support behind a runtime flag (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: For landing Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/CSSParser.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 App le Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 App le Inc. All rights reserved.
4 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 4 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
6 * Copyright (C) 2012 Intel Corporation. All rights reserved. 6 * Copyright (C) 2012 Intel Corporation. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 %type <rule> rule 225 %type <rule> rule
226 %type <rule> valid_rule 226 %type <rule> valid_rule
227 %type <ruleList> block_rule_body 227 %type <ruleList> block_rule_body
228 %type <ruleList> block_rule_list 228 %type <ruleList> block_rule_list
229 %type <ruleList> region_block_rule_body 229 %type <ruleList> region_block_rule_body
230 %type <ruleList> region_block_rule_list 230 %type <ruleList> region_block_rule_list
231 %type <rule> block_rule 231 %type <rule> block_rule
232 %type <rule> block_valid_rule 232 %type <rule> block_valid_rule
233 %type <rule> region 233 %type <rule> region
234 %type <rule> supports 234 %type <rule> supports
235 #if ENABLE_CSS_DEVICE_ADAPTATION
236 %type <rule> viewport 235 %type <rule> viewport
237 #endif
238 %type <rule> filter 236 %type <rule> filter
239 237
240 %type <string> maybe_ns_prefix 238 %type <string> maybe_ns_prefix
241 239
242 %type <string> namespace_selector 240 %type <string> namespace_selector
243 241
244 %type <string> string_or_uri 242 %type <string> string_or_uri
245 %type <string> ident_or_string 243 %type <string> ident_or_string
246 %type <string> medium 244 %type <string> medium
247 %type <marginBox> margin_sym 245 %type <marginBox> margin_sym
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 ruleset 431 ruleset
434 | media 432 | media
435 | page 433 | page
436 | font_face 434 | font_face
437 | keyframes 435 | keyframes
438 | namespace 436 | namespace
439 | import 437 | import
440 | region 438 | region
441 | supports 439 | supports
442 | host 440 | host
443 #if ENABLE_CSS_DEVICE_ADAPTATION
444 | viewport 441 | viewport
445 #endif
446 | filter 442 | filter
447 ; 443 ;
448 444
449 rule: 445 rule:
450 valid_rule { 446 valid_rule {
451 parser->m_hadSyntacticallyValidCSSRule = true; 447 parser->m_hadSyntacticallyValidCSSRule = true;
452 } 448 }
453 | invalid_rule 449 | invalid_rule
454 ; 450 ;
455 451
(...skipping 29 matching lines...) Expand all
485 } 481 }
486 ; 482 ;
487 483
488 block_valid_rule: 484 block_valid_rule:
489 ruleset 485 ruleset
490 | page 486 | page
491 | font_face 487 | font_face
492 | media 488 | media
493 | keyframes 489 | keyframes
494 | supports 490 | supports
495 #if ENABLE_CSS_DEVICE_ADAPTATION
496 | viewport 491 | viewport
497 #endif
498 | filter 492 | filter
499 ; 493 ;
500 494
501 block_rule: 495 block_rule:
502 block_valid_rule 496 block_valid_rule
503 | invalid_rule 497 | invalid_rule
504 | namespace 498 | namespace
505 | import 499 | import
506 | region 500 | region
507 ; 501 ;
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
1011 before_host_rule HOST_SYM at_rule_header_end_maybe_space 1005 before_host_rule HOST_SYM at_rule_header_end_maybe_space
1012 '{' at_rule_body_start maybe_space block_rule_body closing_brace { 1006 '{' at_rule_body_start maybe_space block_rule_body closing_brace {
1013 $$ = parser->createHostRule($7); 1007 $$ = parser->createHostRule($7);
1014 } 1008 }
1015 | before_host_rule HOST_SYM at_rule_recovery { 1009 | before_host_rule HOST_SYM at_rule_recovery {
1016 $$ = 0; 1010 $$ = 0;
1017 parser->endRuleBody(true); 1011 parser->endRuleBody(true);
1018 } 1012 }
1019 ; 1013 ;
1020 1014
1021 #if ENABLE_CSS_DEVICE_ADAPTATION
1022 before_viewport_rule: 1015 before_viewport_rule:
1023 /* empty */ { 1016 /* empty */ {
1024 parser->markViewportRuleBodyStart(); 1017 parser->markViewportRuleBodyStart();
1025 parser->startRuleHeader(CSSRuleSourceData::VIEWPORT_RULE); 1018 parser->startRuleHeader(CSSRuleSourceData::VIEWPORT_RULE);
1026 } 1019 }
1027 ; 1020 ;
1028 1021
1029 viewport: 1022 viewport:
1030 before_viewport_rule WEBKIT_VIEWPORT_RULE_SYM at_rule_header_end_maybe_space 1023 before_viewport_rule WEBKIT_VIEWPORT_RULE_SYM at_rule_header_end_maybe_space
1031 '{' at_rule_body_start maybe_space_before_declaration declaration_list closi ng_brace { 1024 '{' at_rule_body_start maybe_space_before_declaration declaration_list closi ng_brace {
1032 $$ = parser->createViewportRule(); 1025 $$ = parser->createViewportRule();
1033 parser->markViewportRuleBodyEnd(); 1026 parser->markViewportRuleBodyEnd();
1034 } 1027 }
1035 | before_viewport_rule WEBKIT_VIEWPORT_RULE_SYM at_rule_recovery { 1028 | before_viewport_rule WEBKIT_VIEWPORT_RULE_SYM at_rule_recovery {
1036 $$ = 0; 1029 $$ = 0;
1037 parser->endRuleBody(true); 1030 parser->endRuleBody(true);
1038 parser->markViewportRuleBodyEnd(); 1031 parser->markViewportRuleBodyEnd();
1039 } 1032 }
1040 ; 1033 ;
1041 #endif
1042 1034
1043 region_selector: 1035 region_selector:
1044 selector_list { 1036 selector_list {
1045 if ($1) { 1037 if ($1) {
1046 parser->setReusableRegionSelectorVector($1); 1038 parser->setReusableRegionSelectorVector($1);
1047 $$ = parser->reusableRegionSelectorVector(); 1039 $$ = parser->reusableRegionSelectorVector();
1048 } 1040 }
1049 else 1041 else
1050 $$ = 0; 1042 $$ = 0;
1051 } 1043 }
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after
1986 1978
1987 rule_error_recovery: 1979 rule_error_recovery:
1988 /* empty */ 1980 /* empty */
1989 | rule_error_recovery error 1981 | rule_error_recovery error
1990 | rule_error_recovery invalid_square_brackets_block 1982 | rule_error_recovery invalid_square_brackets_block
1991 | rule_error_recovery invalid_parentheses_block 1983 | rule_error_recovery invalid_parentheses_block
1992 ; 1984 ;
1993 1985
1994 %% 1986 %%
1995 1987
OLDNEW
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/CSSParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698