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

third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CSSVariableResolver_h
 #define CSSVariableResolver_h
 
 #include "core/CSSPropertyNames.h"
 #include "core/css/parser/CSSParserToken.h"
 #include "wtf/HashSet.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/AtomicStringHash.h"
 
 namespace blink {
 
 class CSSParserTokenRange;
 class CSSPendingSubstitutionValue;
 class CSSVariableData;
 class CSSVariableReferenceValue;
 class PropertyRegistry;
 class StyleResolverState;
-class StyleVariableData;
+class StyleInheritedVariables;
+class StyleNonInheritedVariables;
 
 class CSSVariableResolver {
     STACK_ALLOCATED();
 public:
     static void resolveVariableDefinitions(const StyleResolverState&);
 
     // Shorthand properties are not supported.
     static const CSSValue* resolveVariableReferences(const StyleResolverState&, CSSPropertyID, const CSSValue&);
 
     DECLARE_TRACE();
@@ skipping 16 matching lines @@
     void resolveApplyAtRule(CSSParserTokenRange&, Vector<CSSParserToken>& result);
 
     // These return null if the custom property is invalid
 
     // Returns the CSSVariableData for a custom property, resolving and storing it if necessary
     CSSVariableData* valueForCustomProperty(AtomicString name);
     // Resolves the CSSVariableData from a custom property declaration
     PassRefPtr<CSSVariableData> resolveCustomProperty(AtomicString name, const CSSVariableData&);
 
     const StyleResolverState& m_styleResolverState;
-    StyleVariableData* m_styleVariableData;
+    StyleInheritedVariables* m_inheritedVariables;
+    StyleNonInheritedVariables* m_nonInheritedVariables;
     Member<const PropertyRegistry> m_registry;
     HashSet<AtomicString> m_variablesSeen;
     // Resolution doesn't finish when a cycle is detected. Fallbacks still
     // need to be tracked for additional cycles, and invalidation only
     // applies back to cycle starts.
     HashSet<AtomicString> m_cycleStartPoints;
 };
 
 } // namespace blink
 
 #endif // CSSVariableResolver