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

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

Issue 1094003002: CSSStyleDeclaration::setProperty should override important style (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Review feedback Created 5 years, 8 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/parser/CSSParser.cpp ('k') | Source/core/editing/EditingStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/ViewportStyleResolver.cpp
diff --git a/Source/core/css/resolver/ViewportStyleResolver.cpp b/Source/core/css/resolver/ViewportStyleResolver.cpp
index be412e3f1b13d80007d3f7ca58cdc2fbabcc5122..5d47d3a59ca32111d1fb2d7d19d27f2659950e8f 100644
--- a/Source/core/css/resolver/ViewportStyleResolver.cpp
+++ b/Source/core/css/resolver/ViewportStyleResolver.cpp
@@ -97,9 +97,9 @@ void ViewportStyleResolver::addViewportRule(StyleRuleViewport* viewportRule, Ori
}
// We cannot use mergeAndOverrideOnConflict() here because it doesn't
- // respect the !important declaration (but addParsedProperty() does).
+ // respect the !important declaration (but addRespectingCascade() does).
for (unsigned i = 0; i < propertyCount; ++i)
- m_propertySet->addParsedProperty(propertySet.propertyAt(i).toCSSProperty());
+ m_propertySet->addRespectingCascade(propertySet.propertyAt(i).toCSSProperty());
}
void ViewportStyleResolver::resolve()
« no previous file with comments | « Source/core/css/parser/CSSParser.cpp ('k') | Source/core/editing/EditingStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698