CSSStyleDeclaration::setProperty should override important style

Source/core/css/StylePropertySet.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 251 matching lines @@
         return;
     }
 
     removePropertiesInSet(shorthand.properties(), shorthand.length());
 
     RefPtrWillBeRawPtr<CSSValue> value = prpValue;
     for (unsigned i = 0; i < shorthand.length(); ++i)
         m_propertyVector.append(CSSProperty(shorthand.properties()[i], value, important));
 }
 
+unsigned getIndexInShorthandVector(const CSSProperty& property)
+{
+    if (!property.isSetFromShorthand())
+        return 0;
+
+    Vector<StylePropertyShorthand, 4> shorthands;
+    getMatchingShorthandsForLonghand(property.id(), &shorthands);
+    return indexOfShorthandForLonghand(property.id(), shorthands);
+}
+
 bool MutableStylePropertySet::setProperty(const CSSProperty& property, CSSProperty* slot)
 {
     if (!removeShorthandProperty(property.id())) {
         CSSProperty* toReplace = slot ? slot : findCSSPropertyWithID(property.id());
         if (toReplace && *toReplace == property)
             return false;
         if (toReplace) {
-            *toReplace = property;
+            // Clear the important flag if the new property is not important
+            if (!property.isImportant() && toReplace->isImportant()) {
+                *toReplace = CSSProperty(property.id(), property.value(), false, property.isSetFromShorthand(), getIndexInShorthandVector(property), property.metadata().m_implicit);

[Timothy Loh, 2015/04/23 05:42:03]

Isn't this just the same as the other branch?

[sashab, 2015/04/23 05:59:05]

Oh, nice. Good point :D

+            } else {
+                *toReplace = property;
+            }
             return true;
         }
     }
     m_propertyVector.append(property);
     return true;
 }
 
 bool MutableStylePropertySet::setProperty(CSSPropertyID propertyID, CSSValueID identifier, bool important)
 {
     setProperty(CSSProperty(propertyID, cssValuePool().createIdentifierValue(identifier), important));
@@ skipping 17 matching lines @@
 {
     bool changed = false;
     m_propertyVector.reserveCapacity(m_propertyVector.size() + properties.size());
     for (unsigned i = 0; i < properties.size(); ++i)
         changed |= addParsedProperty(properties[i]);
     return changed;
 }
 
 bool MutableStylePropertySet::addParsedProperty(const CSSProperty& property)
 {
-    // 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
 {
     return StylePropertySerializer(*this).asText();
 }
 
 void MutableStylePropertySet::mergeAndOverrideOnConflict(const StylePropertySet* other)
 {
     unsigned size = other->propertyCount();
@@ skipping 235 matching lines @@
     result.appendLiteral(": ");
     result.append(propertyValue()->cssText());
     if (isImportant())
         result.appendLiteral(" !important");
     result.append(';');
     return result.toString();
 }
 
 
 } // namespace blink