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

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

Issue 993713002: Fix template angle bracket syntax in CSS subdirs (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
« no previous file with comments | « Source/core/css/parser/BisonCSSTokenizer.h ('k') | Source/core/css/parser/CSSParser.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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 bool boolean; 70 bool boolean;
71 char character; 71 char character;
72 int integer; 72 int integer;
73 double number; 73 double number;
74 CSSParserString string; 74 CSSParserString string;
75 75
76 StyleRuleBase* rule; 76 StyleRuleBase* rule;
77 // The content of the three below HeapVectors are guaranteed to be kept aliv e by 77 // The content of the three below HeapVectors are guaranteed to be kept aliv e by
78 // the corresponding m_parsedRules, m_floatingMediaQueryExpList, and m_parse dKeyFrames 78 // the corresponding m_parsedRules, m_floatingMediaQueryExpList, and m_parse dKeyFrames
79 // lists in BisonCSSParser.h. 79 // lists in BisonCSSParser.h.
80 WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase> >* ruleList; 80 WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase>>* ruleList;
81 WillBeHeapVector<OwnPtrWillBeMember<MediaQueryExp> >* mediaQueryExpList; 81 WillBeHeapVector<OwnPtrWillBeMember<MediaQueryExp>>* mediaQueryExpList;
82 WillBeHeapVector<RefPtrWillBeMember<StyleRuleKeyframe> >* keyframeRuleList; 82 WillBeHeapVector<RefPtrWillBeMember<StyleRuleKeyframe>>* keyframeRuleList;
83 CSSParserSelector* selector; 83 CSSParserSelector* selector;
84 Vector<OwnPtr<CSSParserSelector> >* selectorList; 84 Vector<OwnPtr<CSSParserSelector>>* selectorList;
85 CSSSelector::MarginBoxType marginBox; 85 CSSSelector::MarginBoxType marginBox;
86 CSSSelector::Relation relation; 86 CSSSelector::Relation relation;
87 CSSSelector::AttributeMatchType attributeMatchType; 87 CSSSelector::AttributeMatchType attributeMatchType;
88 MediaQuerySet* mediaList; 88 MediaQuerySet* mediaList;
89 MediaQuery* mediaQuery; 89 MediaQuery* mediaQuery;
90 MediaQuery::Restrictor mediaQueryRestrictor; 90 MediaQuery::Restrictor mediaQueryRestrictor;
91 MediaQueryExp* mediaQueryExp; 91 MediaQueryExp* mediaQueryExp;
92 CSSParserValue value; 92 CSSParserValue value;
93 CSSParserValueList* valueList; 93 CSSParserValueList* valueList;
94 StyleRuleKeyframe* keyframe; 94 StyleRuleKeyframe* keyframe;
(...skipping 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1435 YYERROR; 1435 YYERROR;
1436 } 1436 }
1437 // used by :not 1437 // used by :not
1438 | ':' NOTFUNCTION maybe_space simple_selector maybe_space closing_parenthesi s { 1438 | ':' NOTFUNCTION maybe_space simple_selector maybe_space closing_parenthesi s {
1439 if (!$4->isSimple()) 1439 if (!$4->isSimple())
1440 YYERROR; 1440 YYERROR;
1441 else { 1441 else {
1442 $$ = parser->createFloatingSelector(); 1442 $$ = parser->createFloatingSelector();
1443 $$->setMatch(CSSSelector::PseudoClass); 1443 $$->setMatch(CSSSelector::PseudoClass);
1444 1444
1445 Vector<OwnPtr<CSSParserSelector> > selectorVector; 1445 Vector<OwnPtr<CSSParserSelector>> selectorVector;
1446 selectorVector.append(parser->sinkFloatingSelector($4)); 1446 selectorVector.append(parser->sinkFloatingSelector($4));
1447 $$->adoptSelectorVector(selectorVector); 1447 $$->adoptSelectorVector(selectorVector);
1448 1448
1449 parser->tokenToLowerCase($2); 1449 parser->tokenToLowerCase($2);
1450 $$->setValue($2); 1450 $$->setValue($2);
1451 } 1451 }
1452 } 1452 }
1453 | ':' NOTFUNCTION selector_recovery closing_parenthesis { 1453 | ':' NOTFUNCTION selector_recovery closing_parenthesis {
1454 YYERROR; 1454 YYERROR;
1455 } 1455 }
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
1857 ; 1857 ;
1858 1858
1859 rule_error_recovery: 1859 rule_error_recovery:
1860 /* empty */ 1860 /* empty */
1861 | rule_error_recovery error 1861 | rule_error_recovery error
1862 | rule_error_recovery invalid_square_brackets_block 1862 | rule_error_recovery invalid_square_brackets_block
1863 | rule_error_recovery invalid_parentheses_block 1863 | rule_error_recovery invalid_parentheses_block
1864 ; 1864 ;
1865 1865
1866 %% 1866 %%
OLDNEW
« no previous file with comments | « Source/core/css/parser/BisonCSSTokenizer.h ('k') | Source/core/css/parser/CSSParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698