Chromium Code Reviews| Index: Source/core/css/parser/MediaQueryParser.cpp |
| diff --git a/Source/core/css/parser/MediaQueryParser.cpp b/Source/core/css/parser/MediaQueryParser.cpp |
| index ed83a4b8df83c09ebc3b5752a4685f3bf6ef8611..4b9ebfe69d499de74d4181ab5dd48d0e57281e7b 100644 |
| --- a/Source/core/css/parser/MediaQueryParser.cpp |
| +++ b/Source/core/css/parser/MediaQueryParser.cpp |
| @@ -142,7 +142,7 @@ void MediaQueryParser::readFeatureEnd(MediaQueryTokenType type, TokenIterator& t |
| 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()); |
| @@ -179,9 +179,10 @@ bool MediaQueryParser::observeBlock(BlockParameters& parameters, MediaQueryToken |
| void MediaQueryParser::observeBlocks(MediaQueryTokenType type) |
| { |
| - const unsigned blockParametersNumber = 3; |
| + const unsigned blockParametersNumber = 4; |
|
rune
2014/04/02 12:48:31
We normally use enums like:
enum { BlockParam
|
| BlockParameters blockParameterSet[blockParametersNumber] = { |
| { LeftParenthesisToken, RightParenthesisToken, ParenthesisBlock, DoNotModifyState }, |
| + { FunctionToken, RightParenthesisToken, ParenthesisBlock, ModifyState }, |
| { LeftBracketToken, RightBracketToken, BracketsBlock, ModifyState }, |
| { LeftBraceToken, RightBraceToken, BracesBlock, ModifyState } |
| }; |