CSS Custom Properties (Variables)

Source/core/css/parser/CSSParserImpl.cpp

Index: Source/core/css/parser/CSSParserImpl.cpp
diff --git a/Source/core/css/parser/CSSParserImpl.cpp b/Source/core/css/parser/CSSParserImpl.cpp
index 25dadbcc8243ff8dc58d78528b059bd0b495edc7..1c77d0a2648ffcd547b4425a6080af86f7b4cadf 100644
--- a/Source/core/css/parser/CSSParserImpl.cpp
+++ b/Source/core/css/parser/CSSParserImpl.cpp
@@ -7,6 +7,7 @@
 
 #include "core/css/CSSKeyframesRule.h"
 #include "core/css/CSSStyleSheet.h"
+#include "core/css/CSSVariableValue.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRuleImport.h"
 #include "core/css/StyleRuleKeyframe.h"
@@ -19,6 +20,7 @@
 #include "core/css/parser/CSSSelectorParser.h"
 #include "core/css/parser/CSSSupportsParser.h"
 #include "core/css/parser/CSSTokenizer.h"
+#include "core/css/parser/CSSVariableParser.h"
 #include "core/css/parser/MediaQueryParser.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
@@ -42,7 +44,7 @@ bool CSSParserImpl::parseValue(MutableStylePropertySet* declaration, CSSProperty
     StyleRule::Type ruleType = StyleRule::Style;
     if (declaration->cssParserMode() == CSSViewportRuleMode)
         ruleType = StyleRule::Viewport;
-    CSSTokenizer::Scope scope(string);
+    CSSTokenizerScope scope(string);
     parser.consumeDeclarationValue(scope.tokenRange(), unresolvedProperty, important, ruleType);
     if (parser.m_parsedProperties.isEmpty())
         return false;
@@ -57,7 +59,7 @@ static inline void filterProperties(bool important, const WillBeHeapVector<CSSPr
         if (property.isImportant() != important)
             continue;
         const unsigned propertyIDIndex = property.id() - firstCSSProperty;
-        if (seenProperties.get(propertyIDIndex))
+        if (seenProperties.get(propertyIDIndex) && property.id() != CSSPropertyVariable)
             continue;
         seenProperties.set(propertyIDIndex);
         output[--unusedEntries] = property;
@@ -85,7 +87,7 @@ PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> CSSParserImpl::parseInlineStyl
     CSSParserMode mode = element->isHTMLElement() && !document.inQuirksMode() ? HTMLStandardMode : HTMLQuirksMode;
     context.setMode(mode);
     CSSParserImpl parser(context, document.elementSheet().contents());
-    CSSTokenizer::Scope scope(string);
+    CSSTokenizerScope scope(string);
     parser.consumeDeclarationList(scope.tokenRange(), StyleRule::Style);
     return createStylePropertySet(parser.m_parsedProperties, mode);
 }
@@ -96,7 +98,7 @@ bool CSSParserImpl::parseDeclarationList(MutableStylePropertySet* declaration, c
     StyleRule::Type ruleType = StyleRule::Style;
     if (declaration->cssParserMode() == CSSViewportRuleMode)
         ruleType = StyleRule::Viewport;
-    CSSTokenizer::Scope scope(string);
+    CSSTokenizerScope scope(string);
     parser.consumeDeclarationList(scope.tokenRange(), ruleType);
     if (parser.m_parsedProperties.isEmpty())
         return false;
@@ -106,7 +108,7 @@ bool CSSParserImpl::parseDeclarationList(MutableStylePropertySet* declaration, c
 PassRefPtrWillBeRawPtr<StyleRuleBase> CSSParserImpl::parseRule(const String& string, const CSSParserContext& context, AllowedRulesType allowedRules)
 {
     CSSParserImpl parser(context);
-    CSSTokenizer::Scope scope(string);
+    CSSTokenizerScope scope(string);
     CSSParserTokenRange range = scope.tokenRange();
     range.consumeWhitespace();
     if (range.atEnd())
@@ -132,7 +134,7 @@ void CSSParserImpl::parseStyleSheet(const String& string, const CSSParserContext
         "mode", context.mode());
 
     TRACE_EVENT_BEGIN0("blink,blink_style", "CSSParserImpl::parseStyleSheet.tokenize");
-    CSSTokenizer::Scope scope(string);
+    CSSTokenizerScope scope(string);
     TRACE_EVENT_END0("blink,blink_style", "CSSParserImpl::parseStyleSheet.tokenize");
 
     TRACE_EVENT_BEGIN0("blink,blink_style", "CSSParserImpl::parseStyleSheet.parse");
@@ -153,7 +155,7 @@ void CSSParserImpl::parseStyleSheet(const String& string, const CSSParserContext
 
 PassOwnPtr<Vector<double>> CSSParserImpl::parseKeyframeKeyList(const String& keyList)
 {
-    return consumeKeyframeKeyList(CSSTokenizer::Scope(keyList).tokenRange());
+    return consumeKeyframeKeyList(CSSTokenizerScope(keyList).tokenRange());
 }
 
 bool CSSParserImpl::supportsDeclaration(CSSParserTokenRange& range)
@@ -170,7 +172,7 @@ void CSSParserImpl::parseDeclarationListForInspector(const String& declaration,
     CSSParserImpl parser(context);
     CSSParserObserverWrapper wrapper(observer);
     parser.m_observerWrapper = &wrapper;
-    CSSTokenizer::Scope scope(declaration, *parser.m_observerWrapper);
+    CSSTokenizerScope scope(declaration, *parser.m_observerWrapper);
     observer.startRuleHeader(StyleRule::Style, 0);
     observer.endRuleHeader(1);
     parser.consumeDeclarationList(scope.tokenRange(), StyleRule::Style);
@@ -182,7 +184,7 @@ void CSSParserImpl::parseStyleSheetForInspector(const String& string, const CSSP
     CSSParserImpl parser(context, sheet.get());
     CSSParserObserverWrapper wrapper(observer);
     parser.m_observerWrapper = &wrapper;
-    CSSTokenizer::Scope scope(string, *parser.m_observerWrapper);
+    CSSTokenizerScope scope(string, *parser.m_observerWrapper);
     parser.consumeRuleList(scope.tokenRange(), TopLevelRuleList, [](PassRefPtrWillBeRawPtr<StyleRuleBase> rule) { });
 }
 
@@ -656,7 +658,8 @@ void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range, StyleRule::Typ
     CSSParserTokenRange rangeCopy = range; // For inspector callbacks
 
     ASSERT(range.peek().type() == IdentToken);
-    CSSPropertyID unresolvedProperty = range.consumeIncludingWhitespace().parseAsUnresolvedCSSPropertyID();
+    CSSParserToken token = range.consumeIncludingWhitespace();
+    CSSPropertyID unresolvedProperty = token.parseAsUnresolvedCSSPropertyID();
     if (range.consume().type() != ColonToken)
         return; // Parse error
 
@@ -665,6 +668,14 @@ void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range, StyleRule::Typ
     const CSSParserToken* last = range.end() - 1;
     while (last->type() == WhitespaceToken)
         --last;
+
+    if (unresolvedProperty == CSSPropertyVariable) {
+        ASSERT(RuntimeEnabledFeatures::cssVariablesEnabled());
+        AtomicString variableName = token.value();
+        m_styleSheet->parserSetUsesVariables(true);
+        consumeVariableDeclarationValue(range.makeSubRange(&range.peek(), declarationValueEnd), variableName);
+        return;
+    }
     if (last->type() == IdentToken && last->valueEqualsIgnoringCase("important")) {
         --last;
         while (last->type() == WhitespaceToken)
@@ -685,6 +696,7 @@ void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range, StyleRule::Typ
         m_observerWrapper->observer().observeProperty(
             m_observerWrapper->startOffset(rangeCopy), m_observerWrapper->endOffset(rangeCopy),
             important, m_parsedProperties.size() != propertiesCount);
+            consumeDeclarationValue(range.makeSubRange(&range.peek(), declarationValueEnd), unresolvedProperty, important, ruleType);
         return;
     }
 
@@ -694,14 +706,42 @@ void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range, StyleRule::Typ
     consumeDeclarationValue(range.makeSubRange(&range.peek(), declarationValueEnd), unresolvedProperty, important, ruleType);
 }
 
+void CSSParserImpl::consumeVariableDeclarationValue(CSSParserTokenRange range, const AtomicString& variableName)
+{
+    switch (CSSVariableParser::parseVariableDefinition(range)) {
+    case CSSVariableParser::Invalid:
+        return;
+    case CSSVariableParser::Variable:
+        m_parsedProperties.append(CSSProperty(CSSPropertyVariable,
+            CSSVariableValue::create(variableName, CSSVariableData::create(range, false))));
+        return;
+    case CSSVariableParser::VariableWithReferences:
+        m_parsedProperties.append(CSSProperty(CSSPropertyVariable,
+            CSSVariableValue::create(variableName, CSSVariableData::create(range, true))));
+        return;
+    case CSSVariableParser::Initial:
+        m_parsedProperties.append(CSSProperty(CSSPropertyVariable,
+            CSSVariableValue::create(variableName, CSSValueInitial)));
+        return;
+    case CSSVariableParser::Inherit:
+        m_parsedProperties.append(CSSProperty(CSSPropertyVariable,
+            CSSVariableValue::create(variableName, CSSValueInherit)));
+        return;
+    }
+}
+
 void CSSParserImpl::consumeDeclarationValue(CSSParserTokenRange range, CSSPropertyID unresolvedProperty, bool important, StyleRule::Type ruleType)
 {
-    bool usesRemUnits;
-    CSSParserValueList valueList(range, usesRemUnits);
+    bool usesRemUnits, usesVariables;
+    CSSParserValueList valueList(range, usesRemUnits, usesVariables);
     if (!valueList.size())
         return; // Parser error
-    if (usesRemUnits && m_styleSheet)
-        m_styleSheet->parserSetUsesRemUnits(true);
+    if (m_styleSheet) {
+        if (usesRemUnits)
+            m_styleSheet->parserSetUsesRemUnits(true);
+        if (usesVariables)
+            m_styleSheet->parserSetUsesVariables(true);
+    }
     CSSPropertyParser::parseValue(unresolvedProperty, important, &valueList, m_context, m_parsedProperties, ruleType);
 }