Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(623)

Unified Diff: Source/core/css/parser/MediaQueryParser.cpp

Issue 221693004: Unit test both MQ parsers. Fix MQ parser block handling bugs (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed a couple of errors related to block handling. Added tests Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/MediaQuerySetTest.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 }
};
« no previous file with comments | « Source/core/css/MediaQuerySetTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698