Unit test both MQ parsers. Fix MQ parser block handling bugs

Source/core/css/parser/MediaQueryParser.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/MediaQueryParser.h"
 
 #include "MediaTypeNames.h"
 #include "core/css/parser/CSSPropertyParser.h"
 #include "core/css/parser/MediaQueryTokenizer.h"
@@ skipping 124 matching lines @@
     } else if (type == DelimiterToken && token->delimiter() == '/') {
         m_mediaQueryData.addParserValue(type, *token);
         m_state = ReadFeatureValue;
     } else {
         m_state = SkipUntilBlockEnd;
     }
 }
 
 void MediaQueryParser::skipUntilComma(MediaQueryTokenType type, TokenIterator& token)
 {
-    if (type == CommaToken || type == EOFToken) {
+    if ((type == CommaToken && m_blockStack.isEmpty()) || type == EOFToken) {
         m_state = ReadRestrictor;
         m_mediaQueryData.clear();
         m_querySet->addMediaQuery(MediaQuery::createNotAll());
     }
 }
 
 void MediaQueryParser::skipUntilBlockEnd(MediaQueryTokenType type, TokenIterator& token)
 {
     if (m_blockStack.isEmpty())
         m_state = SkipUntilComma;
@@ skipping 16 matching lines @@
     } else if (type == parameters.rightToken) {
         popIfBlockMatches(m_blockStack, parameters.blockType);
     } else {
         return false;
     }
     return true;
 }
 
 void MediaQueryParser::observeBlocks(MediaQueryTokenType type)
 {
-    const unsigned blockParametersNumber = 3;
-    BlockParameters blockParameterSet[blockParametersNumber] = {
+    enum { BlockParametersCount = 4 };
+    BlockParameters blockParameterSet[BlockParametersCount] = {
         { LeftParenthesisToken, RightParenthesisToken, ParenthesisBlock, DoNotModifyState },
+        { FunctionToken, RightParenthesisToken, ParenthesisBlock, ModifyState },
         { LeftBracketToken, RightBracketToken, BracketsBlock, ModifyState },
         { LeftBraceToken, RightBraceToken, BracesBlock, ModifyState }
     };
 
-    for (unsigned i = 0; i < blockParametersNumber; ++i) {
+    for (unsigned i = 0; i < BlockParametersCount; ++i) {
         if (observeBlock(blockParameterSet[i], type))
             break;
     }
 }
 
 void MediaQueryParser::processToken(TokenIterator& token)
 {
     MediaQueryTokenType type = token->type();
 
     observeBlocks(type);
@@ skipping 71 matching lines @@
     m_valueList.addValue(value);
 }
 
 void MediaQueryData::setMediaType(const String& mediaType)
 {
     m_mediaType = mediaType;
     m_mediaTypeSet = true;
 }
 
 } // namespace WebCore