Moved MQ parsing block tracking to tokenizer

Source/core/css/parser/MediaQueryTokenizer.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/MediaQueryTokenizer.h"
 
 namespace WebCore {
 #include "MediaQueryTokenizerCodepoints.cpp"
 }
@@ skipping 49 matching lines @@
 }
 
 MediaQueryToken MediaQueryTokenizer::whiteSpace(UChar cc)
 {
     // CSS Tokenization is currently lossy, but we could record
     // the exact whitespace instead of discarding it here.
     consumeUntilNonWhitespace();
     return MediaQueryToken(WhitespaceToken);
 }
 
+static bool popIfBlockMatches(Vector<MediaQueryTokenType>& blockStack, MediaQueryTokenType type)
+{
+    if (!blockStack.isEmpty() && blockStack.last() == type) {
+        blockStack.removeLast();
+        return true;
+    }
+    return false;
+}
+
+MediaQueryToken MediaQueryTokenizer::blockStart(MediaQueryTokenType type)
+{
+    m_blockStack.append(type);
+    return MediaQueryToken(type, MediaQueryToken::BlockStart);
+}
+
+MediaQueryToken MediaQueryTokenizer::blockStart(MediaQueryTokenType blockType, MediaQueryTokenType type, String name)
+{
+    m_blockStack.append(blockType);
+    return MediaQueryToken(type, name, MediaQueryToken::BlockStart);
+}
+
+MediaQueryToken MediaQueryTokenizer::blockEnd(MediaQueryTokenType type, MediaQueryTokenType startType)
+{
+    if (popIfBlockMatches(m_blockStack, startType))
+        return MediaQueryToken(type, MediaQueryToken::BlockEnd);
+    return MediaQueryToken(type);
+}
+
 MediaQueryToken MediaQueryTokenizer::leftParenthesis(UChar cc)
 {
-    return MediaQueryToken(LeftParenthesisToken);
+    return blockStart(LeftParenthesisToken);
 }
 
 MediaQueryToken MediaQueryTokenizer::rightParenthesis(UChar cc)
 {
-    return MediaQueryToken(RightParenthesisToken);
+    return blockEnd(RightParenthesisToken, LeftParenthesisToken);
 }
 
 MediaQueryToken MediaQueryTokenizer::leftBracket(UChar cc)
 {
-    return MediaQueryToken(LeftBracketToken);
+    return blockStart(LeftBracketToken);
 }
 
 MediaQueryToken MediaQueryTokenizer::rightBracket(UChar cc)
 {
-    return MediaQueryToken(RightBracketToken);
+    return blockEnd(RightBracketToken, LeftBracketToken);
 }
 
 MediaQueryToken MediaQueryTokenizer::leftBrace(UChar cc)
 {
-    return MediaQueryToken(LeftBraceToken);
+    return blockStart(LeftBraceToken);
 }
 
 MediaQueryToken MediaQueryTokenizer::rightBrace(UChar cc)
 {
-    return MediaQueryToken(RightBraceToken);
+    return blockEnd(RightBraceToken, LeftBraceToken);
 }
 
 MediaQueryToken MediaQueryTokenizer::plusOrFullStop(UChar cc)
 {
     if (nextCharsAreNumber()) {
         reconsume(cc);
         return consumeNumericToken();
     }
     return MediaQueryToken(DelimiterToken, cc);
 }
@@ skipping 101 matching lines @@
 
     if (isASCII(cc)) {
         ASSERT_WITH_SECURITY_IMPLICATION(cc < codePointsNumber);
         codePointFunc = codePoints[cc];
     } else {
         codePointFunc = &MediaQueryTokenizer::nameStart;
     }
 
     if (codePointFunc)
         return ((this)->*(codePointFunc))(cc);
-
     return MediaQueryToken(DelimiterToken, cc);
 }
 
 static int getSign(MediaQueryInputStream& input, unsigned& offset)
 {
     int sign = 1;
     if (input.currentInputChar() == '+') {
         ++offset;
     } else if (input.peek(offset) == '-') {
         sign = -1;
@@ skipping 78 matching lines @@
         token.convertToDimensionWithUnit(consumeName());
     else if (consumeIfNext('%'))
         token.convertToPercentage();
     return token;
 }
 
 // http://www.w3.org/TR/css3-syntax/#consume-an-ident-like-token
 MediaQueryToken MediaQueryTokenizer::consumeIdentLikeToken()
 {
     String name = consumeName();
-    if (consumeIfNext('('))
-        return MediaQueryToken(FunctionToken, name);
+    if (consumeIfNext('(')) {
+        return blockStart(LeftParenthesisToken, FunctionToken, name);
+    }
     return MediaQueryToken(IdentToken, name);
 }
 
 static bool isNewLine(UChar cc)
 {
     // We check \r and \f here, since we have no preprocessing stage
     return (cc == '\r' || cc == '\n' || cc == '\f');
 }
 
 // http://dev.w3.org/csswg/css-syntax/#consume-a-string-token
@@ skipping 137 matching lines @@
     if (firstChar == '-') {
         if (isNameStart(m_input.peek(1)))
             return true;
         return nextTwoCharsAreValidEscape(1);
     }
 
     return false;
 }
 
 } // namespace WebCore