CSS Custom Properties (Variables)

Source/core/css/parser/CSSTokenizer.h

Index: Source/core/css/parser/CSSTokenizer.h
diff --git a/Source/core/css/parser/CSSTokenizer.h b/Source/core/css/parser/CSSTokenizer.h
index 97349c646d55cf85b6de79c87d18d2bd7de70965..7f71afdf0c2a4250c8cebebd8a8bc6dcfc9949d0 100644
--- a/Source/core/css/parser/CSSTokenizer.h
+++ b/Source/core/css/parser/CSSTokenizer.h
@@ -24,6 +24,7 @@ class CORE_EXPORT CSSTokenizer {
     WTF_MAKE_FAST_ALLOCATED(CSSTokenizer);
 public:
     class CORE_EXPORT Scope {
+    WTF_MAKE_FAST_ALLOCATED(Scope);
     public:
         Scope(const String&);
         Scope(const String&, CSSParserObserverWrapper&); // For the inspector
@@ -31,16 +32,18 @@ public:
         CSSParserTokenRange tokenRange();
         unsigned tokenCount();
 
-    private:
+        String string() const { return m_string; }
+    public:
         void storeString(const String& string) { m_stringPool.append(string); }
         Vector<CSSParserToken> m_tokens;
         // We only allocate strings when escapes are used.
         Vector<String> m_stringPool;
         String m_string;
 
+        bool m_hasVariableReference;
+
         friend class CSSTokenizer;
     };
-
 private:
     CSSTokenizer(CSSTokenizerInputStream&, Scope&);
 
@@ -58,12 +61,13 @@ private:
     CSSParserToken consumeUrlToken();
 
     void consumeBadUrlRemnants();
-    void consumeUntilNonWhitespace();
+    unsigned consumeUntilNonWhitespace();
     void consumeSingleWhitespaceIfNext();
     void consumeUntilCommentEndFound();
 
     bool consumeIfNext(UChar);
     CSSParserString consumeName();
+    CSSParserString lastConsumedCharacter();
     UChar32 consumeEscape();
 
     bool nextTwoCharsAreValidEscape();
@@ -110,6 +114,8 @@ private:
 
     CSSParserString registerString(const String&);
 
+    friend class Scope;
+
     CSSTokenizerInputStream& m_input;
     Scope& m_scope;
 };