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

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

Issue 183853035: Renamed /shadow-all/ to /shadow/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed patch conflict Created 6 years, 9 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/dom/shadow/style-with-hat-expected.txt ('k') | Source/core/css/CSSSelector.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 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 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 '{' at_rule_body_start maybe_space_before_declaration declaration_list closi ng_brace { 1039 '{' at_rule_body_start maybe_space_before_declaration declaration_list closi ng_brace {
1040 $$ = parser->createViewportRule(); 1040 $$ = parser->createViewportRule();
1041 parser->markViewportRuleBodyEnd(); 1041 parser->markViewportRuleBodyEnd();
1042 } 1042 }
1043 ; 1043 ;
1044 1044
1045 combinator: 1045 combinator:
1046 '+' maybe_space { $$ = CSSSelector::DirectAdjacent; } 1046 '+' maybe_space { $$ = CSSSelector::DirectAdjacent; }
1047 | '~' maybe_space { $$ = CSSSelector::IndirectAdjacent; } 1047 | '~' maybe_space { $$ = CSSSelector::IndirectAdjacent; }
1048 | '>' maybe_space { $$ = CSSSelector::Child; } 1048 | '>' maybe_space { $$ = CSSSelector::Child; }
1049 // FIXME: implement named combinator and replace the following /shadow/, /sh adow-all/ and 1049 // FIXME: implement named combinator and replace the following /shadow/, /sh adow-child/ and
1050 // /shadow-deep/ with named combinator's implementation. 1050 // /shadow-deep/ with named combinator's implementation.
1051 | '/' IDENT '/' maybe_space { 1051 | '/' IDENT '/' maybe_space {
1052 if (!RuntimeEnabledFeatures::shadowDOMEnabled()) 1052 if (!RuntimeEnabledFeatures::shadowDOMEnabled())
1053 YYERROR; 1053 YYERROR;
1054 if ($2.equalIgnoringCase("shadow-all")) 1054 if ($2.equalIgnoringCase("shadow"))
1055 $$ = CSSSelector::ShadowAll; 1055 $$ = CSSSelector::Shadow;
1056 else if ($2.equalIgnoringCase("shadow-deep")) 1056 else if ($2.equalIgnoringCase("shadow-deep"))
1057 $$ = CSSSelector::ShadowDeep; 1057 $$ = CSSSelector::ShadowDeep;
1058 else if ($2.equalIgnoringCase("content")) 1058 else if ($2.equalIgnoringCase("content"))
1059 $$ = CSSSelector::ShadowContent; 1059 $$ = CSSSelector::ShadowContent;
1060 else 1060 else
1061 YYERROR; 1061 YYERROR;
1062 } 1062 }
1063 ; 1063 ;
1064 1064
1065 maybe_unary_operator: 1065 maybe_unary_operator:
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
1897 1897
1898 rule_error_recovery: 1898 rule_error_recovery:
1899 /* empty */ 1899 /* empty */
1900 | rule_error_recovery error 1900 | rule_error_recovery error
1901 | rule_error_recovery invalid_square_brackets_block 1901 | rule_error_recovery invalid_square_brackets_block
1902 | rule_error_recovery invalid_parentheses_block 1902 | rule_error_recovery invalid_parentheses_block
1903 ; 1903 ;
1904 1904
1905 %% 1905 %%
1906 1906
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/shadow/style-with-hat-expected.txt ('k') | Source/core/css/CSSSelector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698