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

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

Issue 148403006: Merge 164913 "Revert "Explicit space required around NOT/ONLY/AN..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1750/
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 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 | '(' error error_recovery closing_parenthesis { 669 | '(' error error_recovery closing_parenthesis {
670 YYERROR; 670 YYERROR;
671 } 671 }
672 ; 672 ;
673 673
674 media_query_exp_list: 674 media_query_exp_list:
675 media_query_exp { 675 media_query_exp {
676 $$ = parser->createFloatingMediaQueryExpList(); 676 $$ = parser->createFloatingMediaQueryExpList();
677 $$->append(parser->sinkFloatingMediaQueryExp($1)); 677 $$->append(parser->sinkFloatingMediaQueryExp($1));
678 } 678 }
679 | media_query_exp_list space MEDIA_AND space media_query_exp { 679 | media_query_exp_list maybe_space MEDIA_AND maybe_space media_query_exp {
680 $$ = $1; 680 $$ = $1;
681 $$->append(parser->sinkFloatingMediaQueryExp($5)); 681 $$->append(parser->sinkFloatingMediaQueryExp($5));
682 } 682 }
683 ; 683 ;
684 684
685 maybe_and_media_query_exp_list: 685 maybe_and_media_query_exp_list:
686 maybe_space { 686 maybe_space {
687 $$ = parser->createFloatingMediaQueryExpList(); 687 $$ = parser->createFloatingMediaQueryExpList();
688 } 688 }
689 | space MEDIA_AND space media_query_exp_list maybe_space { 689 | maybe_space MEDIA_AND maybe_space media_query_exp_list maybe_space {
690 $$ = $4; 690 $$ = $4;
691 } 691 }
692 ; 692 ;
693 693
694 maybe_media_restrictor: 694 maybe_media_restrictor:
695 /*empty*/ { 695 /*empty*/ {
696 $$ = MediaQuery::None; 696 $$ = MediaQuery::None;
697 } 697 }
698 | MEDIA_ONLY space { 698 | MEDIA_ONLY maybe_space {
699 $$ = MediaQuery::Only; 699 $$ = MediaQuery::Only;
700 } 700 }
701 | MEDIA_NOT space { 701 | MEDIA_NOT maybe_space {
702 $$ = MediaQuery::Not; 702 $$ = MediaQuery::Not;
703 } 703 }
704 ; 704 ;
705 705
706 valid_media_query: 706 valid_media_query:
707 media_query_exp_list maybe_space { 707 media_query_exp_list maybe_space {
708 $$ = parser->createFloatingMediaQuery(parser->sinkFloatingMediaQueryExpL ist($1)); 708 $$ = parser->createFloatingMediaQuery(parser->sinkFloatingMediaQueryExpL ist($1));
709 } 709 }
710 | maybe_media_restrictor medium maybe_and_media_query_exp_list { 710 | maybe_media_restrictor medium maybe_and_media_query_exp_list {
711 parser->tokenToLowerCase($2); 711 parser->tokenToLowerCase($2);
(...skipping 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1976 1976
1977 rule_error_recovery: 1977 rule_error_recovery:
1978 /* empty */ 1978 /* empty */
1979 | rule_error_recovery error 1979 | rule_error_recovery error
1980 | rule_error_recovery invalid_square_brackets_block 1980 | rule_error_recovery invalid_square_brackets_block
1981 | rule_error_recovery invalid_parentheses_block 1981 | rule_error_recovery invalid_parentheses_block
1982 ; 1982 ;
1983 1983
1984 %% 1984 %%
1985 1985
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