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

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

Issue 183803016: Rename ^ and ^^ combinator to /shadow-all/ and /shadow-deep/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 '{' at_rule_body_start maybe_space_before_declaration declaration_list closi ng_brace { 1038 '{' at_rule_body_start maybe_space_before_declaration declaration_list closi ng_brace {
1039 $$ = parser->createViewportRule(); 1039 $$ = parser->createViewportRule();
1040 parser->markViewportRuleBodyEnd(); 1040 parser->markViewportRuleBodyEnd();
1041 } 1041 }
1042 ; 1042 ;
1043 1043
1044 combinator: 1044 combinator:
1045 '+' maybe_space { $$ = CSSSelector::DirectAdjacent; } 1045 '+' maybe_space { $$ = CSSSelector::DirectAdjacent; }
1046 | '~' maybe_space { $$ = CSSSelector::IndirectAdjacent; } 1046 | '~' maybe_space { $$ = CSSSelector::IndirectAdjacent; }
1047 | '>' maybe_space { $$ = CSSSelector::Child; } 1047 | '>' maybe_space { $$ = CSSSelector::Child; }
1048 | '^' maybe_space { 1048 // FIXME: implement named combinator and replace the following /shadow/, /sh adow-all/ and
1049 // /shadow-deep/ with named combinator's implementation.
1050 | '/' IDENT '/' maybe_space {
1049 if (!RuntimeEnabledFeatures::shadowDOMEnabled()) 1051 if (!RuntimeEnabledFeatures::shadowDOMEnabled())
1050 YYERROR; 1052 YYERROR;
1051 $$ = CSSSelector::ChildTree; 1053 if ($2.equalIgnoringCase("shadow-all"))
1052 } 1054 $$ = CSSSelector::ShadowAll;
1053 | '^' '^' maybe_space { 1055 else if ($2.equalIgnoringCase("shadow-deep"))
1054 if (!RuntimeEnabledFeatures::shadowDOMEnabled()) 1056 $$ = CSSSelector::ShadowDeep;
1057 else
1055 YYERROR; 1058 YYERROR;
1056 $$ = CSSSelector::DescendantTree;
1057 } 1059 }
1058 ; 1060 ;
1059 1061
1060 maybe_unary_operator: 1062 maybe_unary_operator:
1061 unary_operator 1063 unary_operator
1062 | /* empty */ { $$ = 1; } 1064 | /* empty */ { $$ = 1; }
1063 ; 1065 ;
1064 1066
1065 unary_operator: 1067 unary_operator:
1066 '-' { $$ = -1; } 1068 '-' { $$ = -1; }
(...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after
1896 1898
1897 rule_error_recovery: 1899 rule_error_recovery:
1898 /* empty */ 1900 /* empty */
1899 | rule_error_recovery error 1901 | rule_error_recovery error
1900 | rule_error_recovery invalid_square_brackets_block 1902 | rule_error_recovery invalid_square_brackets_block
1901 | rule_error_recovery invalid_parentheses_block 1903 | rule_error_recovery invalid_parentheses_block
1902 ; 1904 ;
1903 1905
1904 %% 1906 %%
1905 1907
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