Moved MQ parsing block tracking to tokenizer

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"
 #include "core/css/MediaQueryExp.h"
+#include "core/css/parser/MediaQueryBlockWatcher.h"
 #include "core/css/parser/MediaQueryToken.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 class MediaQuerySet;
 
 class MediaQueryData {
     STACK_ALLOCATED();
 private:
     MediaQuery::Restrictor m_restrictor;
     String m_mediaType;
     OwnPtrWillBeMember<ExpressionHeapVector> m_expressions;
     String m_mediaFeature;
     CSSParserValueList m_valueList;
     bool m_mediaTypeSet;
 
 public:
     MediaQueryData();
     void clear();
     bool addExpression();
-    void addParserValue(MediaQueryTokenType, MediaQueryToken&);
+    void addParserValue(MediaQueryTokenType, const MediaQueryToken&);
     void setMediaType(const String&);
     PassOwnPtrWillBeRawPtr<MediaQuery> takeMediaQuery();
 
     inline bool currentMediaQueryChanged() const
     {
         return (m_restrictor != MediaQuery::None || m_mediaTypeSet || m_expressions->size() > 0);
     }
 
     inline void setRestrictor(MediaQuery::Restrictor restrictor) { m_restrictor = restrictor; }
 
@@ skipping 12 matching lines @@
     enum ParserType {
         MediaQuerySetParser,
         MediaConditionParser,
     };
 
     MediaQueryParser(ParserType);
     virtual ~MediaQueryParser();
 
     PassRefPtrWillBeRawPtr<MediaQuerySet> parseImpl(TokenIterator, TokenIterator endToken);
 
-    enum BlockType {
-        ParenthesisBlock,
-        BracketsBlock,
-        BracesBlock
-    };
+    void processToken(const MediaQueryToken&);
 
-    enum StateChange {
-        ModifyState,
-        DoNotModifyState
-    };
+    void readRestrictor(MediaQueryTokenType, const MediaQueryToken&);
+    void readMediaType(MediaQueryTokenType, const MediaQueryToken&);
+    void readAnd(MediaQueryTokenType, const MediaQueryToken&);
+    void readFeatureStart(MediaQueryTokenType, const MediaQueryToken&);
+    void readFeature(MediaQueryTokenType, const MediaQueryToken&);
+    void readFeatureColon(MediaQueryTokenType, const MediaQueryToken&);
+    void readFeatureValue(MediaQueryTokenType, const MediaQueryToken&);
+    void readFeatureEnd(MediaQueryTokenType, const MediaQueryToken&);
+    void skipUntilComma(MediaQueryTokenType, const MediaQueryToken&);
+    void skipUntilBlockEnd(MediaQueryTokenType, const MediaQueryToken&);
+    void done(MediaQueryTokenType, const MediaQueryToken&);
 
-    struct BlockParameters {
-        MediaQueryTokenType leftToken;
-        MediaQueryTokenType rightToken;
-        BlockType blockType;
-        StateChange stateChange;
-    };
-
-    void processToken(TokenIterator&);
-
-    void readRestrictor(MediaQueryTokenType, TokenIterator&);
-    void readMediaType(MediaQueryTokenType, TokenIterator&);
-    void readAnd(MediaQueryTokenType, TokenIterator&);
-    void readFeatureStart(MediaQueryTokenType, TokenIterator&);
-    void readFeature(MediaQueryTokenType, TokenIterator&);
-    void readFeatureColon(MediaQueryTokenType, TokenIterator&);
-    void readFeatureValue(MediaQueryTokenType, TokenIterator&);
-    void readFeatureEnd(MediaQueryTokenType, TokenIterator&);
-    void skipUntilComma(MediaQueryTokenType, TokenIterator&);
-    void skipUntilBlockEnd(MediaQueryTokenType, TokenIterator&);
-    void done(MediaQueryTokenType, TokenIterator&);
-
-    typedef void (MediaQueryParser::*State)(MediaQueryTokenType, TokenIterator&);
+    typedef void (MediaQueryParser::*State)(MediaQueryTokenType, const MediaQueryToken&);
 
     void setStateAndRestrict(State, MediaQuery::Restrictor);
-    bool observeBlock(BlockParameters&, MediaQueryTokenType);
-    void observeBlocks(MediaQueryTokenType);
-    static void popIfBlockMatches(Vector<MediaQueryParser::BlockType>& blockStack, BlockType);
+    void handleBlocks(const MediaQueryToken&);
 
     State m_state;
     MediaQueryData m_mediaQueryData;
     RefPtrWillBeMember<MediaQuerySet> m_querySet;
-    Vector<BlockType> m_blockStack;
+    MediaQueryBlockWatcher m_blockWatcher;
 
     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