Enable Media condition parsing on the MQ parser

Source/core/css/parser/MediaQueryParser.h

 // 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.
 
 #ifndef MediaQueryParser_h
 #define MediaQueryParser_h
 
 #include "core/css/CSSParserValues.h"
 #include "core/css/MediaList.h"
 #include "core/css/MediaQuery.h"
@@ skipping 30 matching lines @@
     }
 
     inline void setRestrictor(MediaQuery::Restrictor restrictor) { m_restrictor = restrictor; }
 
     inline void setMediaFeature(const String& str) { m_mediaFeature = str; }
 };
 
 class MediaQueryParser {
     STACK_ALLOCATED();
 public:
-    static PassRefPtrWillBeRawPtr<MediaQuerySet> parse(const String&);
+    typedef Vector<MediaQueryToken>::iterator TokenIterator;
+
+    static PassRefPtrWillBeRawPtr<MediaQuerySet> parseMediaQuerySet(const String&);
+    static PassRefPtrWillBeRawPtr<MediaQuerySet> parseMediaCondition(TokenIterator, TokenIterator endToken);
 
 private:
-    MediaQueryParser(const String&);
+    enum ParserType {
+        MediaQuerySetParser,
+        MediaConditionParser,
+    };
+
+    MediaQueryParser(ParserType);
     virtual ~MediaQueryParser() { };

[eseidel, 2014/04/07 22:33:13]

No need for this to be in the header.  I might put the impl in the .cpp file (in
a later patch is fine).

 
-    PassRefPtrWillBeRawPtr<MediaQuerySet> parseImpl();
-
-    typedef Vector<MediaQueryToken>::iterator TokenIterator;
+    PassRefPtrWillBeRawPtr<MediaQuerySet> parseImpl(TokenIterator, TokenIterator endToken);
 
     enum BlockType {
         ParenthesisBlock,
         BracketsBlock,
         BracesBlock
     };
 
     enum StateChange {
         ModifyState,
         DoNotModifyState
@@ skipping 21 matching lines @@
     void done(MediaQueryTokenType, TokenIterator&);
 
     typedef void (MediaQueryParser::*State)(MediaQueryTokenType, TokenIterator&);
 
     void setStateAndRestrict(State, MediaQuery::Restrictor);
     bool observeBlock(BlockParameters&, MediaQueryTokenType);
     void observeBlocks(MediaQueryTokenType);
     static void popIfBlockMatches(Vector<MediaQueryParser::BlockType>& blockStack, BlockType);
 
     State m_state;
-    Vector<MediaQueryToken> m_tokens;
     MediaQueryData m_mediaQueryData;
     RefPtrWillBeMember<MediaQuerySet> m_querySet;
     Vector<BlockType> m_blockStack;
 
     const static State ReadRestrictor;
     const static State ReadMediaType;
     const static State ReadAnd;
     const static State ReadFeatureStart;
     const static State ReadFeature;
     const static State ReadFeatureColon;
     const static State ReadFeatureValue;
     const static State ReadFeatureEnd;
     const static State SkipUntilComma;
     const static State SkipUntilBlockEnd;
     const static State Done;
 
 };
 
 } // namespace WebCore
 
 #endif // MediaQueryParser_h