Moved MQ parsing block tracking to tokenizer

Source/core/css/parser/MediaQueryToken.cpp

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..625f5b842a58c163925e3496d4a9ca0e76406e26 100644
--- a/Source/core/css/parser/MediaQueryToken.cpp
+++ b/Source/core/css/parser/MediaQueryToken.cpp
@@ -17,6 +17,18 @@ MediaQueryToken::MediaQueryToken(MediaQueryTokenType type)
     , m_delimiter(0)
     , m_numericValue(0)
     , m_unit(CSSPrimitiveValue::CSS_UNKNOWN)
+    , m_blockType(NotBlock)
+    , m_blockLevel(0)
+{
+}
+
+MediaQueryToken::MediaQueryToken(MediaQueryTokenType type, BlockType blockType)
+    : m_type(type)
+    , m_delimiter(0)
+    , m_numericValue(0)
+    , m_unit(CSSPrimitiveValue::CSS_UNKNOWN)
+    , m_blockType(blockType)
+    , m_blockLevel(0)
 {
 }
 
@@ -26,6 +38,8 @@ MediaQueryToken::MediaQueryToken(MediaQueryTokenType type, UChar c)
     , m_delimiter(c)
     , m_numericValue(0)
     , m_unit(CSSPrimitiveValue::CSS_UNKNOWN)
+    , m_blockType(NotBlock)
+    , m_blockLevel(0)
 {
     ASSERT(m_type == DelimiterToken);
 }
@@ -36,15 +50,31 @@ MediaQueryToken::MediaQueryToken(MediaQueryTokenType type, String value)
     , m_delimiter(0)
     , m_numericValue(0)
     , m_unit(CSSPrimitiveValue::CSS_UNKNOWN)
+    , m_blockType(NotBlock)
+    , m_blockLevel(0)
+{
+}
+
+MediaQueryToken::MediaQueryToken(MediaQueryTokenType type, String value, BlockType blockType)

[eseidel, 2014/04/08 22:58:51]

It's really error-prone to have this many conctructors.  Very easy to fail to
initialze one member.

+    : m_type(type)
+    , m_value(value)
+    , m_delimiter(0)
+    , m_numericValue(0)
+    , m_unit(CSSPrimitiveValue::CSS_UNKNOWN)
+    , m_blockType(blockType)
+    , m_blockLevel(0)
 {
 }
 
+
 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_blockType(NotBlock)
+    , m_blockLevel(0)
 {
     ASSERT(type == NumberToken);
 }