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

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

Index: third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h
diff --git a/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h b/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h
index ad83c7362f09b9291fe8ac686ac30f0ce4555797..3f3557dce31cdbcb802acad55689445a432c42cd 100644
--- a/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h
+++ b/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h
@@ -19,7 +19,8 @@ class CSSVariableData;
 class CSSVariableReferenceValue;
 class PropertyRegistry;
 class StyleResolverState;
-class StyleVariableData;
+class StyleInheritedVariables;
+class StyleNonInheritedVariables;
 
 class CSSVariableResolver {
     STACK_ALLOCATED();
@@ -56,7 +57,8 @@ private:
     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