Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(199)

Unified Diff: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

Issue 2219543003: Elements using @apply shouldn't use the MatchedPropertiesCache (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove check Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;
}
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/StyleResolver.h ('k') | third_party/WebKit/Source/core/style/ComputedStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698