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

Unified Diff: Source/core/css/CSSGrammar.y.in

Issue 15679021: Parse media attributes and CSSOM media text as media_query_list. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed review issues. Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/media/mq-parsing-expected.txt ('k') | Source/core/css/CSSParser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSGrammar.y.in
diff --git a/Source/core/css/CSSGrammar.y.in b/Source/core/css/CSSGrammar.y.in
index 008756f09231fa0a51fe087b31269f7845bcee65..31f7fe781f1759860640e80e1b4288f93f8012f0 100644
--- a/Source/core/css/CSSGrammar.y.in
+++ b/Source/core/css/CSSGrammar.y.in
@@ -125,12 +125,12 @@ static inline bool isCSSTokenAString(int yytype)
%token NAMESPACE_SYM
%token VARFUNCTION
%token INTERNAL_DECLS_SYM
+%token INTERNAL_MEDIALIST_SYM
%token INTERNAL_RULE_SYM
%token INTERNAL_SELECTOR_SYM
%token INTERNAL_VALUE_SYM
%token WEBKIT_KEYFRAME_RULE_SYM
%token WEBKIT_KEYFRAMES_SYM
-%token WEBKIT_MEDIAQUERY_SYM
%token WEBKIT_REGION_RULE_SYM
%token WEBKIT_VIEWPORT_RULE_SYM
%token WEBKIT_SUPPORTS_CONDITION_SYM
@@ -327,7 +327,7 @@ stylesheet:
| internal_rule maybe_space
| internal_selector maybe_space
| internal_value maybe_space
- | webkit_mediaquery maybe_space
+ | internal_medialist
| webkit_keyframe_rule maybe_space
| webkit_supports_condition maybe_space
;
@@ -362,10 +362,10 @@ internal_value:
}
;
-webkit_mediaquery:
- WEBKIT_MEDIAQUERY_SYM maybe_space valid_media_query '}' {
- parser->m_mediaQuery = parser->sinkFloatingMediaQuery($3);
- }
+internal_medialist:
+ INTERNAL_MEDIALIST_SYM maybe_space maybe_media_list TOKEN_EOF {
+ parser->m_mediaList = $3;
+ }
;
internal_selector:
« no previous file with comments | « LayoutTests/fast/media/mq-parsing-expected.txt ('k') | Source/core/css/CSSParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698