| Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| index cb25b3e0da720e1e4ac1bc6603a9cf7376efb7f5..b160cb46c5c1eb22c09a7a501c3a0b600073e33f 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -1431,12 +1431,14 @@ void StyleResolver::applyAllProperty(StyleResolverState& state, const CSSValue&
|
| }
|
|
|
| template <CSSPropertyPriority priority>
|
| -void StyleResolver::applyPropertiesForApplyAtRule(StyleResolverState& state, const CSSValue& value, bool isImportant, bool inheritedOnly, PropertyWhitelistType propertyWhitelistType)
|
| +void StyleResolver::applyPropertiesForApplyAtRule(StyleResolverState& state, const CSSValue& value, bool isImportant, PropertyWhitelistType propertyWhitelistType)
|
| {
|
| + state.style()->setHasVariableReferenceFromNonInheritedProperty();
|
| if (!state.style()->variables())
|
| return;
|
| const String& name = toCSSCustomIdentValue(value).value();
|
| const StylePropertySet* propertySet = state.customPropertySetForApplyAtRule(name);
|
| + bool inheritedOnly = false;
|
| if (propertySet)
|
| applyProperties<priority>(state, propertySet, isImportant, inheritedOnly, propertyWhitelistType);
|
| }
|
| @@ -1450,7 +1452,8 @@ void StyleResolver::applyProperties(StyleResolverState& state, const StyleProper
|
| CSSPropertyID property = current.id();
|
|
|
| if (property == CSSPropertyApplyAtRule) {
|
| - applyPropertiesForApplyAtRule<priority>(state, current.value(), isImportant, inheritedOnly, propertyWhitelistType);
|
| + DCHECK(!inheritedOnly);
|
| + applyPropertiesForApplyAtRule<priority>(state, current.value(), isImportant, propertyWhitelistType);
|
| continue;
|
| }
|
|
|
|
|