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

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

Issue 223643002: Enable Media condition parsing on the MQ parser (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased. Fixed nit. Created 6 years, 8 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/parser/MediaConditionTest.cpp ('k') | Source/core/css/parser/MediaQueryParser.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/parser/MediaQueryParser.h
diff --git a/Source/core/css/parser/MediaQueryParser.h b/Source/core/css/parser/MediaQueryParser.h
index 27496a7c4a6162c28283c964a89356122c143d27..ca2dc5c27e52bdfa51dc39c938d1e50188360b3c 100644
--- a/Source/core/css/parser/MediaQueryParser.h
+++ b/Source/core/css/parser/MediaQueryParser.h
@@ -48,15 +48,21 @@ public:
class MediaQueryParser {
STACK_ALLOCATED();
public:
- static PassRefPtrWillBeRawPtr<MediaQuerySet> parse(const String&);
+ typedef Vector<MediaQueryToken>::iterator TokenIterator;
+
+ static PassRefPtrWillBeRawPtr<MediaQuerySet> parseMediaQuerySet(const String&);
+ static PassRefPtrWillBeRawPtr<MediaQuerySet> parseMediaCondition(TokenIterator, TokenIterator endToken);
private:
- MediaQueryParser(const String&);
- virtual ~MediaQueryParser() { };
+ enum ParserType {
+ MediaQuerySetParser,
+ MediaConditionParser,
+ };
- PassRefPtrWillBeRawPtr<MediaQuerySet> parseImpl();
+ MediaQueryParser(ParserType);
+ virtual ~MediaQueryParser();
- typedef Vector<MediaQueryToken>::iterator TokenIterator;
+ PassRefPtrWillBeRawPtr<MediaQuerySet> parseImpl(TokenIterator, TokenIterator endToken);
enum BlockType {
ParenthesisBlock,
@@ -98,7 +104,6 @@ private:
static void popIfBlockMatches(Vector<MediaQueryParser::BlockType>& blockStack, BlockType);
State m_state;
- Vector<MediaQueryToken> m_tokens;
MediaQueryData m_mediaQueryData;
RefPtrWillBeMember<MediaQuerySet> m_querySet;
Vector<BlockType> m_blockStack;
« no previous file with comments | « Source/core/css/parser/MediaConditionTest.cpp ('k') | Source/core/css/parser/MediaQueryParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698