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

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

Issue 134893002: Revert "Explicit space required around NOT/ONLY/AND in CSS MQ." (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 | '(' error error_recovery closing_parenthesis { 664 | '(' error error_recovery closing_parenthesis {
665 YYERROR; 665 YYERROR;
666 } 666 }
667 ; 667 ;
668 668
669 media_query_exp_list: 669 media_query_exp_list:
670 media_query_exp { 670 media_query_exp {
671 $$ = parser->createFloatingMediaQueryExpList(); 671 $$ = parser->createFloatingMediaQueryExpList();
672 $$->append(parser->sinkFloatingMediaQueryExp($1)); 672 $$->append(parser->sinkFloatingMediaQueryExp($1));
673 } 673 }
674 | media_query_exp_list space MEDIA_AND space media_query_exp { 674 | media_query_exp_list maybe_space MEDIA_AND maybe_space media_query_exp {
675 $$ = $1; 675 $$ = $1;
676 $$->append(parser->sinkFloatingMediaQueryExp($5)); 676 $$->append(parser->sinkFloatingMediaQueryExp($5));
677 } 677 }
678 ; 678 ;
679 679
680 maybe_and_media_query_exp_list: 680 maybe_and_media_query_exp_list:
681 maybe_space { 681 maybe_space {
682 $$ = parser->createFloatingMediaQueryExpList(); 682 $$ = parser->createFloatingMediaQueryExpList();
683 } 683 }
684 | space MEDIA_AND space media_query_exp_list maybe_space { 684 | maybe_space MEDIA_AND maybe_space media_query_exp_list maybe_space {
685 $$ = $4; 685 $$ = $4;
686 } 686 }
687 ; 687 ;
688 688
689 maybe_media_restrictor: 689 maybe_media_restrictor:
690 /*empty*/ { 690 /*empty*/ {
691 $$ = MediaQuery::None; 691 $$ = MediaQuery::None;
692 } 692 }
693 | MEDIA_ONLY space { 693 | MEDIA_ONLY maybe_space {
694 $$ = MediaQuery::Only; 694 $$ = MediaQuery::Only;
695 } 695 }
696 | MEDIA_NOT space { 696 | MEDIA_NOT maybe_space {
697 $$ = MediaQuery::Not; 697 $$ = MediaQuery::Not;
698 } 698 }
699 ; 699 ;
700 700
701 valid_media_query: 701 valid_media_query:
702 media_query_exp_list maybe_space { 702 media_query_exp_list maybe_space {
703 $$ = parser->createFloatingMediaQuery(parser->sinkFloatingMediaQueryExpL ist($1)); 703 $$ = parser->createFloatingMediaQuery(parser->sinkFloatingMediaQueryExpL ist($1));
704 } 704 }
705 | maybe_media_restrictor medium maybe_and_media_query_exp_list { 705 | maybe_media_restrictor medium maybe_and_media_query_exp_list {
706 parser->tokenToLowerCase($2); 706 parser->tokenToLowerCase($2);
(...skipping 1248 matching lines...) Expand 10 before | Expand all | Expand 10 after
1955 1955
1956 rule_error_recovery: 1956 rule_error_recovery:
1957 /* empty */ 1957 /* empty */
1958 | rule_error_recovery error 1958 | rule_error_recovery error
1959 | rule_error_recovery invalid_square_brackets_block 1959 | rule_error_recovery invalid_square_brackets_block
1960 | rule_error_recovery invalid_parentheses_block 1960 | rule_error_recovery invalid_parentheses_block
1961 ; 1961 ;
1962 1962
1963 %% 1963 %%
1964 1964
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