Index: Source/core/css/parser/MediaQueryParser.h |
diff --git a/Source/core/css/parser/MediaQueryParser.h b/Source/core/css/parser/MediaQueryParser.h |
index ca2dc5c27e52bdfa51dc39c938d1e50188360b3c..ff7af12ab880cfeab2e80893cba8ca5beb04995b 100644 |
--- a/Source/core/css/parser/MediaQueryParser.h |
+++ b/Source/core/css/parser/MediaQueryParser.h |
@@ -64,24 +64,6 @@ private: |
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&); |
@@ -99,14 +81,12 @@ private: |
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 na
|
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; |