| Index: Source/core/css/parser/MediaQueryParser.cpp
|
| diff --git a/Source/core/css/parser/MediaQueryParser.cpp b/Source/core/css/parser/MediaQueryParser.cpp
|
| index 3d43d6cb3fbbfc11c432f75e3ff712134c175899..925a25905bc520ac7cbc6219da3bd79f6d41dcbe 100644
|
| --- a/Source/core/css/parser/MediaQueryParser.cpp
|
| +++ b/Source/core/css/parser/MediaQueryParser.cpp
|
| @@ -38,8 +38,7 @@ const MediaQueryParser::State MediaQueryParser::SkipUntilBlockEnd = &MediaQueryP
|
| const MediaQueryParser::State MediaQueryParser::Done = &MediaQueryParser::done;
|
|
|
| MediaQueryParser::MediaQueryParser(ParserType parserType)
|
| - : m_parserType(parserType)
|
| - , m_querySet(MediaQuerySet::create())
|
| + : m_querySet(MediaQuerySet::create())
|
| {
|
| if (parserType == MediaQuerySetParser)
|
| m_state = &MediaQueryParser::readRestrictor;
|
| @@ -87,7 +86,7 @@ void MediaQueryParser::readAnd(MediaQueryTokenType type, const MediaQueryToken&
|
| {
|
| if (type == IdentToken && equalIgnoringCase(token.value(), "and")) {
|
| m_state = ReadFeatureStart;
|
| - } else if (type == CommaToken && m_parserType != MediaConditionParser) {
|
| + } else if (type == CommaToken) {
|
| m_querySet->addMediaQuery(m_mediaQueryData.takeMediaQuery());
|
| m_state = ReadRestrictor;
|
| } else if (type == EOFToken) {
|
| @@ -192,7 +191,7 @@ PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQueryParser::parseImpl(TokenIterator
|
| for (; token != endToken; ++token)
|
| processToken(*token);
|
|
|
| - if (m_state != ReadAnd && m_state != ReadRestrictor && m_state != Done && (m_parserType != MediaConditionParser || m_state != ReadFeatureStart))
|
| + if (m_state != ReadAnd && m_state != ReadRestrictor && m_state != Done)
|
| m_querySet->addMediaQuery(MediaQuery::createNotAll());
|
| else if (m_mediaQueryData.currentMediaQueryChanged())
|
| m_querySet->addMediaQuery(m_mediaQueryData.takeMediaQuery());
|
|
|