A sizes attribute parser

Source/core/css/parser/MediaQueryParser.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/css/parser/MediaQueryParser.h"
 
 #include "MediaTypeNames.h"
 #include "core/css/parser/CSSPropertyParser.h"
 #include "core/css/parser/MediaQueryTokenizer.h"
@@ skipping 20 matching lines @@
 const MediaQueryParser::State MediaQueryParser::ReadFeatureStart = &MediaQueryParser::readFeatureStart;
 const MediaQueryParser::State MediaQueryParser::ReadFeature = &MediaQueryParser::readFeature;
 const MediaQueryParser::State MediaQueryParser::ReadFeatureColon = &MediaQueryParser::readFeatureColon;
 const MediaQueryParser::State MediaQueryParser::ReadFeatureValue = &MediaQueryParser::readFeatureValue;
 const MediaQueryParser::State MediaQueryParser::ReadFeatureEnd = &MediaQueryParser::readFeatureEnd;
 const MediaQueryParser::State MediaQueryParser::SkipUntilComma = &MediaQueryParser::skipUntilComma;
 const MediaQueryParser::State MediaQueryParser::SkipUntilBlockEnd = &MediaQueryParser::skipUntilBlockEnd;
 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;
     else // MediaConditionParser
         m_state = &MediaQueryParser::readFeatureStart;
 }
 
 MediaQueryParser::~MediaQueryParser() { };
 
 void MediaQueryParser::setStateAndRestrict(State state, MediaQuery::Restrictor restrictor)
@@ skipping 27 matching lines @@
         m_state = SkipUntilComma;
         if (type == CommaToken)
             skipUntilComma(type, token);
     }
 }
 
 void MediaQueryParser::readAnd(MediaQueryTokenType type, const MediaQueryToken& token)
 {
     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) {
         m_state = Done;
     } else {
         m_state = SkipUntilComma;
     }
 }
 
 void MediaQueryParser::readFeatureStart(MediaQueryTokenType type, const MediaQueryToken& token)
@@ skipping 84 matching lines @@
     if (type != WhitespaceToken && type != CommentToken)
         ((this)->*(m_state))(type, token);
 }
 
 // The state machine loop
 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQueryParser::parseImpl(TokenIterator token, TokenIterator endToken)
 {
     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());
 
     return m_querySet;
 }
 
 MediaQueryData::MediaQueryData()
     : m_restrictor(MediaQuery::None)
     , m_mediaType(MediaTypeNames::all)
@@ skipping 48 matching lines @@
     m_valueList.addValue(value);
 }
 
 void MediaQueryData::setMediaType(const String& mediaType)
 {
     m_mediaType = mediaType;
     m_mediaTypeSet = true;
 }
 
 } // namespace WebCore