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

Side by Side Diff: sky/engine/core/css/parser/CSSGrammar.y

Issue 788113002: Simplify HTMLStyleElement. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « sky/engine/core/css/parser/BisonCSSParser-in.cpp ('k') | sky/engine/core/dom/Element.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 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 759
760 keyframes_rule: 760 keyframes_rule:
761 keyframe_rule_list 761 keyframe_rule_list
762 | keyframe_rule_list keyframes_error_recovery { 762 | keyframe_rule_list keyframes_error_recovery {
763 parser->clearProperties(); 763 parser->clearProperties();
764 }; 764 };
765 765
766 keyframe_rule_list: 766 keyframe_rule_list:
767 /* empty */ { 767 /* empty */ {
768 $$ = parser->createFloatingKeyframeVector(); 768 $$ = parser->createFloatingKeyframeVector();
769 parser->resumeErrorLogging();
770 } 769 }
771 | keyframe_rule_list keyframe_rule maybe_space location_label { 770 | keyframe_rule_list keyframe_rule maybe_space location_label {
772 $$ = $1; 771 $$ = $1;
773 $$->append($2); 772 $$->append($2);
774 } 773 }
775 | keyframe_rule_list keyframes_error_recovery invalid_block maybe_space loca tion_label { 774 | keyframe_rule_list keyframes_error_recovery invalid_block maybe_space loca tion_label {
776 parser->clearProperties(); 775 parser->clearProperties();
777 parser->resumeErrorLogging();
778 } 776 }
779 ; 777 ;
780 778
781 keyframe_rule: 779 keyframe_rule:
782 key_list '{' maybe_space declaration_list closing_brace { 780 key_list '{' maybe_space declaration_list closing_brace {
783 $$ = parser->createKeyframe($1); 781 $$ = parser->createKeyframe($1);
784 } 782 }
785 ; 783 ;
786 784
787 key_list: 785 key_list:
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
1420 ; 1418 ;
1421 1419
1422 regular_invalid_at_rule_header: 1420 regular_invalid_at_rule_header:
1423 keyframes_rule_start at_rule_header_recovery 1421 keyframes_rule_start at_rule_header_recovery
1424 | before_font_face_rule FONT_FACE_SYM at_rule_header_recovery 1422 | before_font_face_rule FONT_FACE_SYM at_rule_header_recovery
1425 | before_supports_rule SUPPORTS_SYM error error_location rule_error_recovery { 1423 | before_supports_rule SUPPORTS_SYM error error_location rule_error_recovery {
1426 parser->reportError($4, InvalidSupportsConditionCSSError); 1424 parser->reportError($4, InvalidSupportsConditionCSSError);
1427 parser->popSupportsRuleData(); 1425 parser->popSupportsRuleData();
1428 } 1426 }
1429 | error_location invalid_at at_rule_header_recovery { 1427 | error_location invalid_at at_rule_header_recovery {
1430 parser->resumeErrorLogging();
1431 parser->reportError($1, InvalidRuleCSSError); 1428 parser->reportError($1, InvalidRuleCSSError);
1432 } 1429 }
1433 ; 1430 ;
1434 1431
1435 invalid_rule: 1432 invalid_rule:
1436 error error_location rule_error_recovery at_invalid_rule_header_end invalid_ block { 1433 error error_location rule_error_recovery at_invalid_rule_header_end invalid_ block {
1437 parser->reportError($2, InvalidRuleCSSError); 1434 parser->reportError($2, InvalidRuleCSSError);
1438 } 1435 }
1439 | regular_invalid_at_rule_header at_invalid_rule_header_end ';' 1436 | regular_invalid_at_rule_header at_invalid_rule_header_end ';'
1440 | regular_invalid_at_rule_header at_invalid_rule_header_end invalid_block 1437 | regular_invalid_at_rule_header at_invalid_rule_header_end invalid_block
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
1491 ; 1488 ;
1492 1489
1493 rule_error_recovery: 1490 rule_error_recovery:
1494 /* empty */ 1491 /* empty */
1495 | rule_error_recovery error 1492 | rule_error_recovery error
1496 | rule_error_recovery invalid_square_brackets_block 1493 | rule_error_recovery invalid_square_brackets_block
1497 | rule_error_recovery invalid_parentheses_block 1494 | rule_error_recovery invalid_parentheses_block
1498 ; 1495 ;
1499 1496
1500 %% 1497 %%
OLDNEW
« no previous file with comments | « sky/engine/core/css/parser/BisonCSSParser-in.cpp ('k') | sky/engine/core/dom/Element.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698