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

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

Issue 18311002: Partial implementation of CSSVariablesMap for CSS Variables CSSOM (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Removed unused IDL callback definition Created 7 years, 6 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: Source/core/css/resolver/StyleResolver.cpp
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index bc446bcf45582d77dc6849495838e54afc89f6dd..fb425826acda9bf8fcaa030dad2285f61a35a589 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -2343,10 +2343,13 @@ void StyleResolver::resolveVariables(CSSPropertyID id, CSSValue* value, Vector<s
for (unsigned i = 0; i < resultSet->propertyCount(); i++) {
StylePropertySet::PropertyReference property = resultSet->propertyAt(i);
- if (property.id() != CSSPropertyVariable && hasVariableReference(property.value()))
+ if (property.id() != CSSPropertyVariable && hasVariableReference(property.value())) {
resolveVariables(property.id(), property.value(), knownExpressions);
- else
+ } else {
applyProperty(property.id(), property.value());
+ // All properties become dependent their parent style when they use variables.
+ m_state.style()->setHasExplicitlyInheritedProperties();
+ }
}
}
« Source/core/css/CSSVariablesMap.idl ('K') | « Source/core/css/StylePropertySet.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698