CSS Custom Properties (Variables)

Source/core/css/CSSCalculationValue.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/css/CSSCalculationValue.h"
 
 #include "core/css/CSSPrimitiveValueMappings.h"
+#include "core/css/parser/CSSPropertyParser.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "wtf/MathExtras.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/text/StringBuilder.h"
 
 static const int maxExpressionDepth = 100;
 
 enum ParseState {
     OK,
     TooDeep,
@@ skipping 83 matching lines @@
     case CSSPrimitiveValue::CSS_RGBCOLOR:
     case CSSPrimitiveValue::CSS_PAIR:
     case CSSPrimitiveValue::CSS_SHAPE:
     case CSSPrimitiveValue::CSS_QUAD:
     case CSSPrimitiveValue::CSS_CALC:
     case CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_NUMBER:
     case CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_LENGTH:
     case CSSPrimitiveValue::CSS_PROPERTY_ID:
     case CSSPrimitiveValue::CSS_VALUE_ID:
     case CSSPrimitiveValue::CSS_QEM:
+    case CSSPrimitiveValue::CSS_VARIABLE_REFERENCE:
         return false;
     };
     ASSERT_NOT_REACHED();
     return false;
 }
 
 static String buildCSSText(const String& expression)
 {
     StringBuilder result;
     result.appendLiteral("calc");
@@ skipping 480 matching lines @@
         CSSParserValue* value = tokens->valueAt(index);
         if (value->unit != CSSParserValue::Operator)
             return 0;
 
         return value->iValue;
     }
 
     bool parseValue(CSSParserValueList* tokens, unsigned* index, Value* result)
     {
         CSSParserValue* parserValue = tokens->valueAt(*index);
-        if (parserValue->unit >= CSSParserValue::Operator)
-            return false;
+
+        if (parserValue->unit >= CSSParserValue::Operator) {
+            // We still have to check for variables, which are parser values
+            if (!RuntimeEnabledFeatures::cssVariablesEnabled() || !CSSPropertyParser::isVariableReference(parserValue))
+                return false;
+
+            result->value = CSSCalcPrimitiveValue::create(

[alancutter (OOO until 2018), 2015/07/14 06:12:57]

Is this ever hit? Don't we short circuit variable references in
CSSPropertyParser::parseValue()?

+                CSSPrimitiveValue::create(parserValue->function->args->valueAt(0)->string, CSSPrimitiveValue::CSS_VARIABLE_REFERENCE), parserValue->isInt);
+            ++*index;
+
+            return true;
+        }
 
         CSSPrimitiveValue::UnitType type = static_cast<CSSPrimitiveValue::UnitType>(parserValue->unit);
+
         if (unitCategory(type) == CalcOther)
             return false;
 
         result->value = CSSCalcPrimitiveValue::create(
             CSSPrimitiveValue::create(parserValue->fValue, type), parserValue->isInt);
 
         ++*index;
         return true;
     }
 
@@ skipping 107 matching lines @@
     return adoptRefWillBeNoop(new CSSCalcValue(expression, range));
 }
 
 DEFINE_TRACE_AFTER_DISPATCH(CSSCalcValue)
 {
     visitor->trace(m_expression);
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink