A thread safe CSS calc parser for sizes

Source/core/css/parser/MediaQueryToken.h

Index: Source/core/css/parser/MediaQueryToken.h
diff --git a/Source/core/css/parser/MediaQueryToken.h b/Source/core/css/parser/MediaQueryToken.h
index f70615e780f82f1c67d553f26449c8c8489dcc25..a5d7202fa476721dc5b00f833fa1281edfce278f 100644
--- a/Source/core/css/parser/MediaQueryToken.h
+++ b/Source/core/css/parser/MediaQueryToken.h
@@ -12,25 +12,25 @@ namespace WebCore {
 
 enum MediaQueryTokenType {
     IdentToken = 0,
-    FunctionToken = 1,
-    DelimiterToken = 2,
-    NumberToken = 3,
-    PercentageToken = 4,
-    DimensionToken = 5,
-    WhitespaceToken = 6,
-    ColonToken = 7,
-    SemicolonToken = 8,
-    CommaToken = 9,
-    LeftParenthesisToken = 10,
-    RightParenthesisToken = 11,
-    LeftBracketToken = 12,
-    RightBracketToken = 13,
-    LeftBraceToken = 14,
-    RightBraceToken = 15,
-    StringToken = 15,
-    BadStringToken = 16,
-    EOFToken = 17,
-    CommentToken = 18,
+    FunctionToken,
+    DelimiterToken,
+    NumberToken,
+    PercentageToken,
+    DimensionToken,
+    WhitespaceToken,
+    ColonToken,
+    SemicolonToken,
+    CommaToken,
+    LeftParenthesisToken,
+    RightParenthesisToken,
+    LeftBracketToken,
+    RightBracketToken,
+    LeftBraceToken,
+    RightBraceToken,
+    StringToken,
+    BadStringToken,
+    EOFToken,
+    CommentToken,
 };
 
 enum NumericValueType {
@@ -62,11 +62,11 @@ public:
     String value() const { return m_value; }
     String textForUnitTests() const;
 
-    UChar delimiter() const { return m_delimiter; }
-    NumericValueType numericValueType() const { return m_numericValueType; }
-    double numericValue() const { return m_numericValue; }
-    CSSPrimitiveValue::UnitTypes unitType() const { return m_unit; }
+    UChar delimiter() const;
+    NumericValueType numericValueType() const;
+    double numericValue() const;
     BlockType blockType() const { return m_blockType; }
+    CSSPrimitiveValue::UnitTypes unitType() const { return m_unit; }
 
 private:
     MediaQueryTokenType m_type;
@@ -81,6 +81,8 @@ private:
     BlockType m_blockType;
 };
 
+typedef Vector<MediaQueryToken>::iterator MediaQueryTokenIterator;
+
 } // namespace
 
 #endif // MediaQueryToken_h