CSS Custom Properties (Variables)

Source/core/css/parser/CSSParserValues.h

 /*
  * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 30 matching lines @@
     union {
         double fValue;
         int iValue;
         CSSParserString string;
         CSSParserFunction* function;
         CSSParserValueList* valueList;
         struct {
             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,
         Function  = 0x100001,
         ValueList = 0x100002,
         HexColor = 0x100004,
         // Represents a dimension by a list of two values, a CSS_NUMBER and an CSS_IDENT
         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;
 
     inline void setFromNumber(double value, int unit = CSSPrimitiveValue::CSS_NUMBER);
     inline void setFromOperator(UChar);
     inline void setFromFunction(CSSParserFunction*);
     inline void setFromValueList(PassOwnPtr<CSSParserValueList>);
 };
 
 class CORE_EXPORT CSSParserValueList {
     WTF_MAKE_FAST_ALLOCATED(CSSParserValueList);
 public:
     CSSParserValueList()
         : m_current(0)
     {
     }
-    CSSParserValueList(CSSParserTokenRange, bool& usesRemUnits);
+    CSSParserValueList(CSSParserTokenRange, bool& usesRemUnits, bool& usesVariables);
     ~CSSParserValueList();
 
     void addValue(const CSSParserValue&);
 
     unsigned size() const { return m_values.size(); }
     unsigned currentIndex() { return m_current; }
     CSSParserValue* current() { return m_current < m_values.size() ? &m_values[m_current] : 0; }
     CSSParserValue* next() { ++m_current; return current(); }
     CSSParserValue* previous()
     {
         if (!m_current)
             return 0;
         --m_current;
         return current();
     }
     void setCurrentIndex(unsigned index)
     {
         ASSERT(index < m_values.size());
         if (index < m_values.size())
             m_current = index;
     }
 
     CSSParserValue* valueAt(unsigned i) { return i < m_values.size() ? &m_values[i] : 0; }
 
     void clearAndLeakValues() { m_values.clear(); m_current = 0;}
     void destroyAndClear();
+private:
+    void checkForVariableReferencesOrDestroyAndClear(const CSSParserTokenRange& originalRange);
+    void consumeVariableValue(const CSSParserTokenRange&);
 
-private:
     unsigned m_current;
     Vector<CSSParserValue, 4> m_values;
 };
 
 struct CSSParserFunction {
     WTF_MAKE_FAST_ALLOCATED(CSSParserFunction);
 public:
     CSSValueID id;
     OwnPtr<CSSParserValueList> args;
 };
@@ skipping 79 matching lines @@
 }
 
 inline void CSSParserValue::setFromValueList(PassOwnPtr<CSSParserValueList> valueList)
 {
     id = CSSValueInvalid;
     this->valueList = valueList.leakPtr();
     unit = ValueList;
     isInt = false;
 }
 
-}
+};
 
 #endif