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 5dd986b8db1dfa14eff6c5ad8ddf1f935c7fd579..9ec7c4aebe248ee32bd35024a46e9996c02e2dbf 100644 |
--- a/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h |
+++ b/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h |
@@ -17,19 +17,23 @@ class CSSParserTokenRange; |
class CSSPendingSubstitutionValue; |
class CSSVariableData; |
class CSSVariableReferenceValue; |
+class PropertyRegistry; |
class StyleResolverState; |
class StyleVariableData; |
class CSSVariableResolver { |
+ STACK_ALLOCATED(); |
public: |
- static void resolveVariableDefinitions(StyleVariableData*); |
+ static void resolveVariableDefinitions(const StyleResolverState&); |
static const CSSValue* resolvePendingSubstitutions(StyleResolverState&, CSSPropertyID, const CSSPendingSubstitutionValue&); |
// Shorthand properties are not supported. |
static const CSSValue* resolveVariableReferences(const StyleResolverState&, CSSPropertyID, const CSSVariableReferenceValue&); |
+ DECLARE_TRACE(); |
+ |
private: |
- CSSVariableResolver(StyleVariableData*); |
+ CSSVariableResolver(const StyleResolverState&); |
// These return false if we encounter a reference to an invalid variable with no fallback |
@@ -49,7 +53,9 @@ private: |
// Resolves the CSSVariableData from a custom property declaration |
PassRefPtr<CSSVariableData> resolveCustomProperty(AtomicString name, const CSSVariableData&); |
+ const StyleResolverState& m_styleResolverState; |
StyleVariableData* m_styleVariableData; |
+ 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 |