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"
@@ skipping 46 matching lines @@
     enum ParserType {
         MediaQuerySetParser,
         MediaConditionParser,
     };
 
     MediaQueryParser(ParserType);
     virtual ~MediaQueryParser();
 
     PassRefPtrWillBeRawPtr<MediaQuerySet> parseImpl(TokenIterator, TokenIterator endToken);
 
-    enum BlockType {
-        ParenthesisBlock,
-        BracketsBlock,
-        BracesBlock
-    };
-
-    enum StateChange {
-        ModifyState,
-        DoNotModifyState
-    };
-
-    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&);
 
     void setStateAndRestrict(State, MediaQuery::Restrictor);
-    bool observeBlock(BlockParameters&, MediaQueryTokenType);
-    void observeBlocks(MediaQueryTokenType);
-    static void popIfBlockMatches(Vector<MediaQueryParser::BlockType>& blockStack, BlockType);
+    void observeBlocks(TokenIterator&);

[eseidel, 2014/04/08 16:58:49]

nit: I'm really not a fan of "observe" for this name.  "handle" would be more
inline with how the HTML parser names similar functions.. .I Think.

 
     State m_state;
     MediaQueryData m_mediaQueryData;
     RefPtrWillBeMember<MediaQuerySet> m_querySet;
-    Vector<BlockType> m_blockStack;
+    unsigned m_blockLevel;
 
     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