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

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

Issue 756313002: Remove CSSCharsetRule (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: tests 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/StyleSheetContents.cpp ('k') | Source/core/frame/UseCounter.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 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 closing_square_bracket: 459 closing_square_bracket:
460 ']' 460 ']'
461 | %prec LOWEST_PREC TOKEN_EOF 461 | %prec LOWEST_PREC TOKEN_EOF
462 ; 462 ;
463 463
464 semi_or_eof: 464 semi_or_eof:
465 ';' 465 ';'
466 | TOKEN_EOF 466 | TOKEN_EOF
467 ; 467 ;
468 468
469 before_charset_rule:
470 /* empty */ {
471 parser->startRule();
472 parser->startRuleHeader(CSSRuleSourceData::CHARSET_RULE);
473 }
474
475 maybe_charset: 469 maybe_charset:
476 /* empty */ 470 /* empty */
477 | before_charset_rule CHARSET_SYM maybe_space STRING maybe_space semi_or_eof { 471 | CHARSET_SYM maybe_space STRING maybe_space semi_or_eof
478 if (parser->m_styleSheet) 472 | CHARSET_SYM at_rule_recovery
479 parser->m_styleSheet->parserSetEncodingFromCharsetRule($4);
480 parser->endRuleHeader();
481 parser->startRuleBody();
482 parser->endRule(true);
483 }
484 | before_charset_rule CHARSET_SYM at_rule_recovery {
485 parser->endRule(false);
486 }
487 ; 473 ;
488 474
489 rule_list: 475 rule_list:
490 /* empty */ 476 /* empty */
491 | rule_list rule maybe_sgml { 477 | rule_list rule maybe_sgml {
492 if ($2 && parser->m_styleSheet) 478 if ($2 && parser->m_styleSheet)
493 parser->m_styleSheet->parserAppendRule($2); 479 parser->m_styleSheet->parserAppendRule($2);
494 } 480 }
495 ; 481 ;
496 482
(...skipping 1359 matching lines...) Expand 10 before | Expand all | Expand 10 after
1856 ; 1842 ;
1857 1843
1858 rule_error_recovery: 1844 rule_error_recovery:
1859 /* empty */ 1845 /* empty */
1860 | rule_error_recovery error 1846 | rule_error_recovery error
1861 | rule_error_recovery invalid_square_brackets_block 1847 | rule_error_recovery invalid_square_brackets_block
1862 | rule_error_recovery invalid_parentheses_block 1848 | rule_error_recovery invalid_parentheses_block
1863 ; 1849 ;
1864 1850
1865 %% 1851 %%
OLDNEW
« no previous file with comments | « Source/core/css/StyleSheetContents.cpp ('k') | Source/core/frame/UseCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698