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

Unified Diff: Source/core/css/parser/MediaQueryParser.cpp

Issue 224733011: A sizes attribute parser (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed rebase Created 6 years, 8 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 | « Source/core/css/parser/MediaQueryParser.h ('k') | Source/core/css/parser/SizesAttributeParser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/parser/MediaQueryParser.cpp
diff --git a/Source/core/css/parser/MediaQueryParser.cpp b/Source/core/css/parser/MediaQueryParser.cpp
index 925a25905bc520ac7cbc6219da3bd79f6d41dcbe..3d43d6cb3fbbfc11c432f75e3ff712134c175899 100644
--- a/Source/core/css/parser/MediaQueryParser.cpp
+++ b/Source/core/css/parser/MediaQueryParser.cpp
@@ -38,7 +38,8 @@ const MediaQueryParser::State MediaQueryParser::SkipUntilBlockEnd = &MediaQueryP
const MediaQueryParser::State MediaQueryParser::Done = &MediaQueryParser::done;
MediaQueryParser::MediaQueryParser(ParserType parserType)
- : m_querySet(MediaQuerySet::create())
+ : m_parserType(parserType)
+ , m_querySet(MediaQuerySet::create())
{
if (parserType == MediaQuerySetParser)
m_state = &MediaQueryParser::readRestrictor;
@@ -86,7 +87,7 @@ void MediaQueryParser::readAnd(MediaQueryTokenType type, const MediaQueryToken&
{
if (type == IdentToken && equalIgnoringCase(token.value(), "and")) {
m_state = ReadFeatureStart;
- } else if (type == CommaToken) {
+ } else if (type == CommaToken && m_parserType != MediaConditionParser) {
m_querySet->addMediaQuery(m_mediaQueryData.takeMediaQuery());
m_state = ReadRestrictor;
} else if (type == EOFToken) {
@@ -191,7 +192,7 @@ PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQueryParser::parseImpl(TokenIterator
for (; token != endToken; ++token)
processToken(*token);
- if (m_state != ReadAnd && m_state != ReadRestrictor && m_state != Done)
+ if (m_state != ReadAnd && m_state != ReadRestrictor && m_state != Done && (m_parserType != MediaConditionParser || m_state != ReadFeatureStart))
m_querySet->addMediaQuery(MediaQuery::createNotAll());
else if (m_mediaQueryData.currentMediaQueryChanged())
m_querySet->addMediaQuery(m_mediaQueryData.takeMediaQuery());
« no previous file with comments | « Source/core/css/parser/MediaQueryParser.h ('k') | Source/core/css/parser/SizesAttributeParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698