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

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

Issue 225293006: Moved MQ parsing block tracking to tokenizer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Debug build fix 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
Index: Source/core/css/parser/MediaQueryToken.cpp
diff --git a/Source/core/css/parser/MediaQueryToken.cpp b/Source/core/css/parser/MediaQueryToken.cpp
index 3696005d30e0b2ff8fbd962c24d558557fb5db4d..479d5513961d894be79b0ceb3e625f8262d522c4 100644
--- a/Source/core/css/parser/MediaQueryToken.cpp
+++ b/Source/core/css/parser/MediaQueryToken.cpp
@@ -17,6 +17,16 @@ MediaQueryToken::MediaQueryToken(MediaQueryTokenType type)
, m_delimiter(0)
, m_numericValue(0)
, m_unit(CSSPrimitiveValue::CSS_UNKNOWN)
+ , m_blockToken(NotBlockToken)
+{
+}
+
+MediaQueryToken::MediaQueryToken(MediaQueryTokenType type, BlockToken blockToken)
+ : m_type(type)
+ , m_delimiter(0)
+ , m_numericValue(0)
+ , m_unit(CSSPrimitiveValue::CSS_UNKNOWN)
+ , m_blockToken(blockToken)
{
}
@@ -26,6 +36,7 @@ MediaQueryToken::MediaQueryToken(MediaQueryTokenType type, UChar c)
, m_delimiter(c)
, m_numericValue(0)
, m_unit(CSSPrimitiveValue::CSS_UNKNOWN)
+ , m_blockToken(NotBlockToken)
{
ASSERT(m_type == DelimiterToken);
}
@@ -36,15 +47,28 @@ MediaQueryToken::MediaQueryToken(MediaQueryTokenType type, String value)
, m_delimiter(0)
, m_numericValue(0)
, m_unit(CSSPrimitiveValue::CSS_UNKNOWN)
+ , m_blockToken(NotBlockToken)
+{
+}
+
+MediaQueryToken::MediaQueryToken(MediaQueryTokenType type, String value, BlockToken blockToken)
+ : m_type(type)
+ , m_value(value)
+ , m_delimiter(0)
+ , m_numericValue(0)
+ , m_unit(CSSPrimitiveValue::CSS_UNKNOWN)
+ , m_blockToken(blockToken)
{
}
+
MediaQueryToken::MediaQueryToken(MediaQueryTokenType type, double numericValue, NumericValueType numericValueType)
: m_type(type)
, m_delimiter(0)
, m_numericValueType(numericValueType)
, m_numericValue(numericValue)
, m_unit(CSSPrimitiveValue::CSS_NUMBER)
+ , m_blockToken(NotBlockToken)
{
ASSERT(type == NumberToken);
}

Powered by Google App Engine
This is Rietveld 408576698