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

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

Issue 23542021: Explicit space required around NOT/ONLY/AND in CSS MQ. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed unrelated whitespace fixes. Created 7 years, 2 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
« no previous file with comments | « LayoutTests/fast/media/media-query-only-not-expected.html ('k') | no next file » | 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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 parser->m_selectorListForParseSelector->adoptSelectorVector(*$3); 390 parser->m_selectorListForParseSelector->adoptSelectorVector(*$3);
391 } 391 }
392 ; 392 ;
393 393
394 internal_supports_condition: 394 internal_supports_condition:
395 INTERNAL_SUPPORTS_CONDITION_SYM maybe_space supports_condition TOKEN_EOF { 395 INTERNAL_SUPPORTS_CONDITION_SYM maybe_space supports_condition TOKEN_EOF {
396 parser->m_supportsCondition = $3; 396 parser->m_supportsCondition = $3;
397 } 397 }
398 ; 398 ;
399 399
400 space:
401 WHITESPACE
402 | space WHITESPACE
403 ;
404
400 maybe_space: 405 maybe_space:
401 /* empty */ %prec UNIMPORTANT_TOK 406 /* empty */ %prec UNIMPORTANT_TOK
402 | maybe_space WHITESPACE 407 | space
403 ; 408 ;
404 409
405 maybe_sgml: 410 maybe_sgml:
406 /* empty */ 411 /* empty */
407 | maybe_sgml SGML_CD 412 | maybe_sgml SGML_CD
408 | maybe_sgml WHITESPACE 413 | maybe_sgml WHITESPACE
409 ; 414 ;
410 415
411 maybe_charset: 416 maybe_charset:
412 /* empty */ 417 /* empty */
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 maybe_media_value: 596 maybe_media_value:
592 /*empty*/ { 597 /*empty*/ {
593 $$ = 0; 598 $$ = 0;
594 } 599 }
595 | ':' maybe_space expr { 600 | ':' maybe_space expr {
596 $$ = $3; 601 $$ = $3;
597 } 602 }
598 ; 603 ;
599 604
600 media_query_exp: 605 media_query_exp:
601 '(' maybe_space IDENT maybe_space maybe_media_value closing_parenthesis mayb e_space { 606 '(' maybe_space IDENT maybe_space maybe_media_value closing_parenthesis {
602 parser->tokenToLowerCase($3); 607 parser->tokenToLowerCase($3);
603 $$ = parser->createFloatingMediaQueryExp($3, $5); 608 $$ = parser->createFloatingMediaQueryExp($3, $5);
604 if (!$$) 609 if (!$$)
605 YYERROR; 610 YYERROR;
606 } 611 }
607 | '(' error error_recovery closing_parenthesis { 612 | '(' error error_recovery closing_parenthesis {
608 YYERROR; 613 YYERROR;
609 } 614 }
610 ; 615 ;
611 616
612 media_query_exp_list: 617 media_query_exp_list:
613 media_query_exp { 618 media_query_exp {
614 $$ = parser->createFloatingMediaQueryExpList(); 619 $$ = parser->createFloatingMediaQueryExpList();
615 $$->append(parser->sinkFloatingMediaQueryExp($1)); 620 $$->append(parser->sinkFloatingMediaQueryExp($1));
616 } 621 }
617 | media_query_exp_list MEDIA_AND maybe_space media_query_exp { 622 | media_query_exp_list space MEDIA_AND space media_query_exp {
618 $$ = $1; 623 $$ = $1;
619 $$->append(parser->sinkFloatingMediaQueryExp($4)); 624 $$->append(parser->sinkFloatingMediaQueryExp($5));
620 } 625 }
621 ; 626 ;
622 627
623 maybe_and_media_query_exp_list: 628 maybe_and_media_query_exp_list:
624 /*empty*/ { 629 maybe_space {
625 $$ = parser->createFloatingMediaQueryExpList(); 630 $$ = parser->createFloatingMediaQueryExpList();
626 } 631 }
627 | MEDIA_AND maybe_space media_query_exp_list { 632 | space MEDIA_AND space media_query_exp_list maybe_space {
628 $$ = $3; 633 $$ = $4;
629 } 634 }
630 ; 635 ;
631 636
632 maybe_media_restrictor: 637 maybe_media_restrictor:
633 /*empty*/ { 638 /*empty*/ {
634 $$ = MediaQuery::None; 639 $$ = MediaQuery::None;
635 } 640 }
636 | MEDIA_ONLY maybe_space { 641 | MEDIA_ONLY space {
637 $$ = MediaQuery::Only; 642 $$ = MediaQuery::Only;
638 } 643 }
639 | MEDIA_NOT maybe_space { 644 | MEDIA_NOT space {
640 $$ = MediaQuery::Not; 645 $$ = MediaQuery::Not;
641 } 646 }
642 ; 647 ;
643 648
644 valid_media_query: 649 valid_media_query:
645 media_query_exp_list { 650 media_query_exp_list maybe_space {
646 $$ = parser->createFloatingMediaQuery(parser->sinkFloatingMediaQueryExpL ist($1)); 651 $$ = parser->createFloatingMediaQuery(parser->sinkFloatingMediaQueryExpL ist($1));
647 } 652 }
648 | maybe_media_restrictor medium maybe_and_media_query_exp_list { 653 | maybe_media_restrictor medium maybe_and_media_query_exp_list {
649 parser->tokenToLowerCase($2); 654 parser->tokenToLowerCase($2);
650 $$ = parser->createFloatingMediaQuery($1, $2, parser->sinkFloatingMediaQ ueryExpList($3)); 655 $$ = parser->createFloatingMediaQuery($1, $2, parser->sinkFloatingMediaQ ueryExpList($3));
651 } 656 }
652 ; 657 ;
653 658
654 media_query: 659 media_query:
655 valid_media_query 660 valid_media_query
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 $$ = 0; 730 $$ = 0;
726 parser->endRuleBody(true); 731 parser->endRuleBody(true);
727 } 732 }
728 | before_media_rule MEDIA_SYM at_rule_recovery { 733 | before_media_rule MEDIA_SYM at_rule_recovery {
729 $$ = 0; 734 $$ = 0;
730 parser->endRuleBody(true); 735 parser->endRuleBody(true);
731 } 736 }
732 ; 737 ;
733 738
734 medium: 739 medium:
735 IDENT maybe_space 740 IDENT
736 ; 741 ;
737 742
738 supports: 743 supports:
739 before_supports_rule SUPPORTS_SYM maybe_space supports_condition at_supports _rule_header_end '{' at_rule_body_start maybe_space block_rule_body closing_brac e { 744 before_supports_rule SUPPORTS_SYM maybe_space supports_condition at_supports _rule_header_end '{' at_rule_body_start maybe_space block_rule_body closing_brac e {
740 $$ = parser->createSupportsRule($4, $9); 745 $$ = parser->createSupportsRule($4, $9);
741 } 746 }
742 | before_supports_rule SUPPORTS_SYM error error_location rule_error_recovery at_rule_end { 747 | before_supports_rule SUPPORTS_SYM error error_location rule_error_recovery at_rule_end {
743 $$ = 0; 748 $$ = 0;
744 parser->reportError($4, CSSParser::InvalidSupportsConditionError); 749 parser->reportError($4, CSSParser::InvalidSupportsConditionError);
745 parser->endRuleBody(true); 750 parser->endRuleBody(true);
(...skipping 1182 matching lines...) Expand 10 before | Expand all | Expand 10 after
1928 1933
1929 rule_error_recovery: 1934 rule_error_recovery:
1930 /* empty */ 1935 /* empty */
1931 | rule_error_recovery error 1936 | rule_error_recovery error
1932 | rule_error_recovery invalid_square_brackets_block 1937 | rule_error_recovery invalid_square_brackets_block
1933 | rule_error_recovery invalid_parentheses_block 1938 | rule_error_recovery invalid_parentheses_block
1934 ; 1939 ;
1935 1940
1936 %% 1941 %%
1937 1942
OLDNEW
« no previous file with comments | « LayoutTests/fast/media/media-query-only-not-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698