CSS Custom Properties (Variables)

Source/core/css/parser/CSSParserValues.h

Index: Source/core/css/parser/CSSParserValues.h
diff --git a/Source/core/css/parser/CSSParserValues.h b/Source/core/css/parser/CSSParserValues.h
index 0b760f1c510c1c80821ddb17d9dfcf286d1e92d8..4504a07631224c7e69ea2ad5b9cbefbdb52b3372 100644
--- a/Source/core/css/parser/CSSParserValues.h
+++ b/Source/core/css/parser/CSSParserValues.h
@@ -48,6 +48,7 @@ struct CSSParserValue {
             UChar32 start;
             UChar32 end;
         } m_unicodeRange;
+        CSSVariableData* variableData;

[alancutter (OOO until 2018), 2015/06/26 06:56:07]

We want to remove CSSParserValues eventually and only work on token ranges. In
that world I think we'll be attempting to parse first and scanning for variable
references if parsing fails. I wonder if it's worth using that method here
instead of extending CSSParserValues.

     };
     enum {
         Operator  = 0x100000,
@@ -58,6 +59,8 @@ struct CSSParserValue {
         DimensionList = 0x100006,
         // Represents a unicode range by a pair of UChar32 values
         UnicodeRange = 0x100007,
+        // Reperesents a copy of part of a CSSTokenizer::Scope for defining and resolving variables
+        VariableValue = 0x100008,
     };
     int unit;
 
@@ -74,7 +77,7 @@ public:
         : m_current(0)
     {
     }
-    CSSParserValueList(CSSParserTokenRange, bool& usesRemUnits);
+    CSSParserValueList(CSSParserTokenRange, bool& usesRemUnits, bool& usesVariables);
     ~CSSParserValueList();
 
     void addValue(const CSSParserValue&);
@@ -101,8 +104,10 @@ public:
 
     void clearAndLeakValues() { m_values.clear(); m_current = 0;}
     void destroyAndClear();
-
 private:
+    void checkForVariableReferencesOrDestroyAndClear(const CSSParserTokenRange& originalRange);
+    void consumeVariableValue(const CSSParserTokenRange&);
+
     unsigned m_current;
     Vector<CSSParserValue, 4> m_values;
 };
@@ -202,6 +207,6 @@ inline void CSSParserValue::setFromValueList(PassOwnPtr<CSSParserValueList> valu
     isInt = false;
 }
 
-}
+};
 
 #endif