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

Unified Diff: Source/core/css/StylePropertySet.cpp

Issue 1094003002: CSSStyleDeclaration::setProperty should override important style (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed a bunch of unnecessary stuff 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 | « LayoutTests/fast/css/important-js-override-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/StylePropertySet.cpp
diff --git a/Source/core/css/StylePropertySet.cpp b/Source/core/css/StylePropertySet.cpp
index 310c2a543c87b6d3dad8f560b3fe8410f56ad5d3..5707a1bd2e9b9f2f59b074298b7ddf39c472dd9d 100644
--- a/Source/core/css/StylePropertySet.cpp
+++ b/Source/core/css/StylePropertySet.cpp
@@ -314,10 +314,7 @@ bool MutableStylePropertySet::addParsedProperties(const WillBeHeapVector<CSSProp
bool MutableStylePropertySet::addParsedProperty(const CSSProperty& property)
Timothy Loh 2015/04/24 00:35:05 Other functions call this and expect it to do what
{
- // Only add properties that have no !important counterpart present
- if (!propertyIsImportant(property.id()) || property.isImportant())
- return setProperty(property);
- return false;
+ return setProperty(property);
}
String StylePropertySet::asText() const
« no previous file with comments | « LayoutTests/fast/css/important-js-override-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698