CSS Properties and Values API: Support non-inherited custom properties

third_party/WebKit/Source/core/style/ComputedStyle.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * 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
@@ skipping 1749 matching lines @@
     void copyChildDependentFlagsFrom(const ComputedStyle&);
 
     // Counters.
     const CounterDirectiveMap* counterDirectives() const;
     CounterDirectiveMap& accessCounterDirectives();
     const CounterDirectives getCounterDirectives(const AtomicString& identifier) const;
     void clearIncrementDirectives();
     void clearResetDirectives();
 
     // Variables.
-    static StyleVariableData* initialVariables() { return nullptr; }
-    StyleVariableData* variables() const;
-    void setVariable(const AtomicString&, PassRefPtr<CSSVariableData>);
-    void removeVariable(const AtomicString&);
+    static StyleInheritedVariables* initialInheritedVariables() { return nullptr; }
+    static StyleNonInheritedVariables* initialNonInheritedVariables() { return nullptr; }
+
+    StyleInheritedVariables* inheritedVariables() const;
+    StyleNonInheritedVariables* nonInheritedVariables() const;
+
+    void setUnresolvedInheritedVariable(const AtomicString&, PassRefPtr<CSSVariableData>);
+    void setUnresolvedNonInheritedVariable(const AtomicString&, PassRefPtr<CSSVariableData>);
+
+    void setResolvedUnregisteredVariable(const AtomicString&, PassRefPtr<CSSVariableData>);
+    void setResolvedInheritedVariable(const AtomicString&, PassRefPtr<CSSVariableData>, const CSSValue*);
+    void setResolvedNonInheritedVariable(const AtomicString&, PassRefPtr<CSSVariableData>, const CSSValue*);
+
+    void removeInheritedVariable(const AtomicString&);
+    void removeNonInheritedVariable(const AtomicString&);
+
     void setHasVariableReferenceFromNonInheritedProperty() { m_nonInheritedData.m_variableReference = true; }
     bool hasVariableReferenceFromNonInheritedProperty() const { return m_nonInheritedData.m_variableReference; }
 
-    // Call these after setting the CSSVariableData
-    void setRegisteredInheritedProperty(const AtomicString&, const CSSValue*);
-
     // Animations.
     CSSAnimationData& accessAnimations();
     const CSSAnimationData* animations() const { return m_rareNonInheritedData->m_animations.get(); }
 
     // Transitions.
     const CSSTransitionData* transitions() const { return m_rareNonInheritedData->m_transitions.get(); }
     CSSTransitionData& accessTransitions();
 
     // Callback selectors.
     const Vector<String>& callbackSelectors() const { return m_rareNonInheritedData->m_callbackSelectors; }
@@ skipping 736 matching lines @@
 
     bool diffNeedsFullLayoutAndPaintInvalidation(const ComputedStyle& other) const;
     bool diffNeedsFullLayout(const ComputedStyle& other) const;
     bool diffNeedsPaintInvalidationSubtree(const ComputedStyle& other) const;
     bool diffNeedsPaintInvalidationObject(const ComputedStyle& other) const;
     bool diffNeedsPaintInvalidationObjectForPaintImage(const StyleImage*, const ComputedStyle& other) const;
     void updatePropertySpecificDifferences(const ComputedStyle& other, StyleDifference&) const;
 
     bool requireTransformOrigin(ApplyTransformOrigin applyOrigin, ApplyMotionPath) const;
     static bool shadowListHasCurrentColor(const ShadowList*);
+
+    StyleInheritedVariables& mutableInheritedVariables();
+    StyleNonInheritedVariables& mutableNonInheritedVariables();
 };
 
 // FIXME: Reduce/remove the dependency on zoom adjusted int values.
 // The float or LayoutUnit versions of layout values should be used.
 int adjustForAbsoluteZoom(int value, float zoomFactor);
 
 inline int adjustForAbsoluteZoom(int value, const ComputedStyle* style)
 {
     float zoomFactor = style->effectiveZoom();
     if (zoomFactor == 1)
@@ skipping 84 matching lines @@
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const
 {
     return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 } // namespace blink
 
 #endif // ComputedStyle_h