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

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

Issue 666433002: Revert of Use count strings as keyframes/animation-name identifiers (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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 | « no previous file | Source/core/css/parser/CSSPropertyParser.cpp » ('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 21 matching lines...) Expand all
32 #include "core/css/parser/BisonCSSParser.h" 32 #include "core/css/parser/BisonCSSParser.h"
33 #include "core/css/parser/CSSParserMode.h" 33 #include "core/css/parser/CSSParserMode.h"
34 #include "core/css/CSSPrimitiveValue.h" 34 #include "core/css/CSSPrimitiveValue.h"
35 #include "core/css/CSSSelector.h" 35 #include "core/css/CSSSelector.h"
36 #include "core/css/CSSSelectorList.h" 36 #include "core/css/CSSSelectorList.h"
37 #include "core/css/MediaList.h" 37 #include "core/css/MediaList.h"
38 #include "core/css/MediaQueryExp.h" 38 #include "core/css/MediaQueryExp.h"
39 #include "core/css/StyleRule.h" 39 #include "core/css/StyleRule.h"
40 #include "core/css/StyleSheetContents.h" 40 #include "core/css/StyleSheetContents.h"
41 #include "core/dom/Document.h" 41 #include "core/dom/Document.h"
42 #include "core/frame/UseCounter.h"
43 #include "wtf/FastMalloc.h" 42 #include "wtf/FastMalloc.h"
44 #include <stdlib.h> 43 #include <stdlib.h>
45 #include <string.h> 44 #include <string.h>
46 45
47 using namespace blink; 46 using namespace blink;
48 using namespace HTMLNames; 47 using namespace HTMLNames;
49 48
50 #define YYMALLOC fastMalloc 49 #define YYMALLOC fastMalloc
51 #define YYFREE fastFree 50 #define YYFREE fastFree
52 51
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 ; 855 ;
857 856
858 keyframes: 857 keyframes:
859 keyframes_rule_start keyframe_name at_rule_header_end_maybe_space '{' at_rul e_body_start maybe_space location_label keyframes_rule closing_brace { 858 keyframes_rule_start keyframe_name at_rule_header_end_maybe_space '{' at_rul e_body_start maybe_space location_label keyframes_rule closing_brace {
860 $$ = parser->createKeyframesRule($2, parser->sinkFloatingKeyframeVector( $8), $1 /* isPrefixed */); 859 $$ = parser->createKeyframesRule($2, parser->sinkFloatingKeyframeVector( $8), $1 /* isPrefixed */);
861 } 860 }
862 ; 861 ;
863 862
864 keyframe_name: 863 keyframe_name:
865 IDENT 864 IDENT
866 | STRING { 865 | STRING
867 parser->m_context.useCounter()->count(UseCounter::QuotedKeyframesRule);
868 }
869 ; 866 ;
870 867
871 keyframes_rule: 868 keyframes_rule:
872 keyframe_rule_list 869 keyframe_rule_list
873 | keyframe_rule_list keyframes_error_recovery { 870 | keyframe_rule_list keyframes_error_recovery {
874 parser->clearProperties(); 871 parser->clearProperties();
875 }; 872 };
876 873
877 keyframe_rule_list: 874 keyframe_rule_list:
878 /* empty */ { 875 /* empty */ {
(...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after
1859 ; 1856 ;
1860 1857
1861 rule_error_recovery: 1858 rule_error_recovery:
1862 /* empty */ 1859 /* empty */
1863 | rule_error_recovery error 1860 | rule_error_recovery error
1864 | rule_error_recovery invalid_square_brackets_block 1861 | rule_error_recovery invalid_square_brackets_block
1865 | rule_error_recovery invalid_parentheses_block 1862 | rule_error_recovery invalid_parentheses_block
1866 ; 1863 ;
1867 1864
1868 %% 1865 %%
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698