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

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: Rebased onto ToT, cleaned up includes Created 7 years, 5 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
« no previous file with comments | « Source/core/css/StylePropertySet.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleResolver.cpp
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index 8f3353ab0aaf9e319fe8d694715a18d4e6607ac7..dea64ad5151676b33732cc62b0837ec7e23cc196 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -1351,10 +1351,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 on their parent style when they use variables.
+ m_state.style()->setHasExplicitlyInheritedProperties();
+ }
}
}
@@ -1390,7 +1393,7 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
if (id == CSSPropertyVariable) {
ASSERT_WITH_SECURITY_IMPLICATION(value->isVariableValue());
- CSSVariableValue* variable = static_cast<CSSVariableValue*>(value);
+ CSSVariableValue* variable = toCSSVariableValue(value);
ASSERT(!variable->name().isEmpty());
ASSERT(!variable->value().isEmpty());
state.style()->setVariable(variable->name(), variable->value());
« no previous file with comments | « Source/core/css/StylePropertySet.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698