Moved MQ parsing block tracking to tokenizer

Source/core/css/parser/MediaQueryToken.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/css/parser/MediaQueryToken.h"
 
 #include "wtf/HashMap.h"
 #include "wtf/text/StringHash.h"
 #include <limits.h>
 
 namespace WebCore {
 
 
 MediaQueryToken::MediaQueryToken(MediaQueryTokenType type)
     : m_type(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)
+{
+}
+
 // Just a helper used for Delimiter tokens.
 MediaQueryToken::MediaQueryToken(MediaQueryTokenType type, UChar c)
     : m_type(type)
     , m_delimiter(c)
     , m_numericValue(0)
     , m_unit(CSSPrimitiveValue::CSS_UNKNOWN)
+    , m_blockType(NotBlock)
+    , m_blockLevel(0)
 {
     ASSERT(m_type == DelimiterToken);
 }
 
 MediaQueryToken::MediaQueryToken(MediaQueryTokenType type, String value)
     : m_type(type)
     , m_value(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);
 }
 
 void MediaQueryToken::convertToDimensionWithUnit(String unit)
 {
     ASSERT(m_type == NumberToken);
     m_type = DimensionToken;
     m_unit = CSSPrimitiveValue::fromName(unit);
 }
@@ skipping 38 matching lines @@
             sprintf(buffer, "%d%s", static_cast<int>(m_numericValue), unitBuffer);
         else
             sprintf(buffer, "%f%s", m_numericValue, unitBuffer);
 
         return String(buffer, strlen(buffer));
     }
     return String();
 }
 
 } // namespace WebCore