CSS Custom Properties (Variables)

Source/core/css/CSSPrimitiveValue.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/css/CSSPrimitiveValue.h"
 
 #include "core/css/CSSBasicShapes.h"
 #include "core/css/CSSCalculationValue.h"
 #include "core/css/CSSHelper.h"
 #include "core/css/CSSMarkup.h"
 #include "core/css/CSSToLengthConversionData.h"
+#include "core/css/CSSVariableData.h"
 #include "core/css/Counter.h"
 #include "core/css/Pair.h"
 #include "core/css/Rect.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/dom/Node.h"
 #include "core/style/ComputedStyle.h"
 #include "platform/LayoutUnit.h"
 #include "platform/fonts/FontMetrics.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/ThreadSpecific.h"
@@ skipping 199 matching lines @@
 
 CSSPrimitiveValue::CSSPrimitiveValue(const String& str, UnitType type)
     : CSSValue(PrimitiveClass)
 {
     init(type);
     m_value.string = str.impl();
     if (m_value.string)
         m_value.string->ref();
 }
 
+CSSPrimitiveValue::CSSPrimitiveValue(CSSVariableData* variableData)
+    : CSSValue(PrimitiveClass)
+{
+    init(UnitType::VariableReference);
+    m_value.variableData = variableData;
+    ASSERT(m_value.variableData);
+    m_value.variableData->ref();
+}

[alancutter (OOO until 2018), 2015/08/25 01:59:08]

This should be done in an init(PassRefPtrWillBeRawPtr<CSSVariableData>) method
like all the other ref counted members.

+
 CSSPrimitiveValue::CSSPrimitiveValue(const LengthSize& lengthSize, const ComputedStyle& style)
     : CSSValue(PrimitiveClass)
 {
     init(lengthSize, style);
 }
 
 CSSPrimitiveValue::CSSPrimitiveValue(RGBA32 color)
     : CSSValue(PrimitiveClass)
 {
     init(UnitType::RGBColor);
@@ skipping 174 matching lines @@
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
         ASSERT_NOT_REACHED();
         break;
     case UnitType::Shape:
         // We must not call deref() when oilpan is enabled because m_value.shape is traced.
 #if !ENABLE(OILPAN)
         m_value.shape->deref();
 #endif
         break;
+    case UnitType::VariableReference:
+#if !ENABLE(OILPAN)
+        m_value.variableData->deref();
+#endif
+        break;
     case UnitType::Number:
     case UnitType::Integer:
     case UnitType::Percentage:
     case UnitType::Ems:
     case UnitType::QuirkyEms:
     case UnitType::Exs:
     case UnitType::Rems:
     case UnitType::Chs:
     case UnitType::Pixels:
     case UnitType::Centimeters:
@@ skipping 469 matching lines @@
     case UnitType::Counter:
     case UnitType::Rect:
     case UnitType::Quad:
     case UnitType::RGBColor:
     case UnitType::Pair:
     case UnitType::Calc:
     case UnitType::Shape:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
     case UnitType::QuirkyEms:
+    case UnitType::VariableReference:
         break;
     };
     ASSERT_NOT_REACHED();
     return "";
 }
 
 String CSSPrimitiveValue::customCSSText() const
 {
     if (m_hasCachedCSSText) {
         ASSERT(cssTextCache().contains(this));
@@ skipping 100 matching lines @@
     }
     case UnitType::Pair:
         text = getPairValue()->cssText();
         break;
     case UnitType::Calc:
         text = m_value.calc->customCSSText();
         break;
     case UnitType::Shape:
         text = m_value.shape->cssText();
         break;
+    case UnitType::VariableReference: {
+        StringBuilder result;
+        result.appendLiteral("var(");

[Timothy Loh, 2015/08/25 09:21:09]

Shouldn't this just return (..).serialize(), instead of wrapping in var()?

+        CSSParserTokenRange range = m_value.variableData->tokenRange();
+        result.append(range.serialize());
+        result.appendLiteral(")");
+        text = result.toString();
+        break;
+    }
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
     case UnitType::QuirkyEms:
         ASSERT_NOT_REACHED();
         break;
     }
 
     ASSERT(!cssTextCache().contains(this));
     cssTextCache().set(this, text);
     m_hasCachedCSSText = true;
@@ skipping 52 matching lines @@
     case UnitType::Quad:
         return m_value.quad && other.m_value.quad && m_value.quad->equals(*other.m_value.quad);
     case UnitType::RGBColor:
         return m_value.rgbcolor == other.m_value.rgbcolor;
     case UnitType::Pair:
         return m_value.pair && other.m_value.pair && m_value.pair->equals(*other.m_value.pair);
     case UnitType::Calc:
         return m_value.calc && other.m_value.calc && m_value.calc->equals(*other.m_value.calc);
     case UnitType::Shape:
         return m_value.shape && other.m_value.shape && m_value.shape->equals(*other.m_value.shape);
+    case UnitType::VariableReference:
+        return m_value.variableData == other.m_value.variableData;
     case UnitType::Integer:
     case UnitType::Chs:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
     case UnitType::QuirkyEms:
         return false;
     }
     return false;
 }
 
@@ skipping 20 matching lines @@
         visitor->trace(m_value.shape);
         break;
     default:
         break;
     }
 #endif
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink