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

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

Issue 130823003: Merge 164913 "Revert "Explicit space required around NOT/ONLY/AN..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1700/
Patch Set: Created 6 years, 11 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 | « 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 2
3 /* 3 /*
4 * Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org) 4 * Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 App le Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 App le Inc. All rights reserved.
6 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 6 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
7 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2012 Intel Corporation. All rights reserved. 8 * Copyright (C) 2012 Intel Corporation. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 | '(' error error_recovery closing_parenthesis { 652 | '(' error error_recovery closing_parenthesis {
653 YYERROR; 653 YYERROR;
654 } 654 }
655 ; 655 ;
656 656
657 media_query_exp_list: 657 media_query_exp_list:
658 media_query_exp { 658 media_query_exp {
659 $$ = parser->createFloatingMediaQueryExpList(); 659 $$ = parser->createFloatingMediaQueryExpList();
660 $$->append(parser->sinkFloatingMediaQueryExp($1)); 660 $$->append(parser->sinkFloatingMediaQueryExp($1));
661 } 661 }
662 | media_query_exp_list space MEDIA_AND space media_query_exp { 662 | media_query_exp_list maybe_space MEDIA_AND maybe_space media_query_exp {
663 $$ = $1; 663 $$ = $1;
664 $$->append(parser->sinkFloatingMediaQueryExp($5)); 664 $$->append(parser->sinkFloatingMediaQueryExp($5));
665 } 665 }
666 ; 666 ;
667 667
668 maybe_and_media_query_exp_list: 668 maybe_and_media_query_exp_list:
669 maybe_space { 669 maybe_space {
670 $$ = parser->createFloatingMediaQueryExpList(); 670 $$ = parser->createFloatingMediaQueryExpList();
671 } 671 }
672 | space MEDIA_AND space media_query_exp_list maybe_space { 672 | maybe_space MEDIA_AND maybe_space media_query_exp_list maybe_space {
673 $$ = $4; 673 $$ = $4;
674 } 674 }
675 ; 675 ;
676 676
677 maybe_media_restrictor: 677 maybe_media_restrictor:
678 /*empty*/ { 678 /*empty*/ {
679 $$ = MediaQuery::None; 679 $$ = MediaQuery::None;
680 } 680 }
681 | MEDIA_ONLY space { 681 | MEDIA_ONLY maybe_space {
682 $$ = MediaQuery::Only; 682 $$ = MediaQuery::Only;
683 } 683 }
684 | MEDIA_NOT space { 684 | MEDIA_NOT maybe_space {
685 $$ = MediaQuery::Not; 685 $$ = MediaQuery::Not;
686 } 686 }
687 ; 687 ;
688 688
689 valid_media_query: 689 valid_media_query:
690 media_query_exp_list maybe_space { 690 media_query_exp_list maybe_space {
691 $$ = parser->createFloatingMediaQuery(parser->sinkFloatingMediaQueryExpL ist($1)); 691 $$ = parser->createFloatingMediaQuery(parser->sinkFloatingMediaQueryExpL ist($1));
692 } 692 }
693 | maybe_media_restrictor medium maybe_and_media_query_exp_list { 693 | maybe_media_restrictor medium maybe_and_media_query_exp_list {
694 parser->tokenToLowerCase($2); 694 parser->tokenToLowerCase($2);
(...skipping 1288 matching lines...) Expand 10 before | Expand all | Expand 10 after
1983 1983
1984 rule_error_recovery: 1984 rule_error_recovery:
1985 /* empty */ 1985 /* empty */
1986 | rule_error_recovery error 1986 | rule_error_recovery error
1987 | rule_error_recovery invalid_square_brackets_block 1987 | rule_error_recovery invalid_square_brackets_block
1988 | rule_error_recovery invalid_parentheses_block 1988 | rule_error_recovery invalid_parentheses_block
1989 ; 1989 ;
1990 1990
1991 %% 1991 %%
1992 1992
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