Changeset 179917 in webkit

Timestamp:

Feb 10, 2015, 10:02:40 PM (12 years ago)

Author:

Chris Dumez

Message:

Optimize MutableStyleProperties::removePropertiesInSet()
​https://bugs.webkit.org/show_bug.cgi?id=141460

Reviewed by Andreas Kling.

Optimize MutableStyleProperties::removePropertiesInSet() by doing an
in-place removal of the vector properties, using the new and efficient
Vector::removalAllMatching().

I see a ~11% speed-up on CSS/CSSPropertySetterGetter.html performance
test.

This change was inspired by the following Blink revision:
​https://src.chromium.org/viewvc/blink?view=rev&revision=189387

Test: PerformanceTests/CSS/CSSPropertySetterGetter.html

• css/StyleProperties.cpp:

(WebCore::MutableStyleProperties::removePropertiesInSet):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StyleProperties.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-10  Chris Dumez  <cdumez@apple.com>
+
+        Optimize MutableStyleProperties::removePropertiesInSet()
+        https://bugs.webkit.org/show_bug.cgi?id=141460
+
+        Reviewed by Andreas Kling.
+
+        Optimize MutableStyleProperties::removePropertiesInSet() by doing an
+        in-place removal of the vector properties, using the new and efficient
+        Vector::removalAllMatching().
+
+        I see a ~11% speed-up on CSS/CSSPropertySetterGetter.html performance
+        test.
+
+        This change was inspired by the following Blink revision:
+        https://src.chromium.org/viewvc/blink?view=rev&revision=189387
+
+        Test: PerformanceTests/CSS/CSSPropertySetterGetter.html
+
+        * css/StyleProperties.cpp:
+        (WebCore::MutableStyleProperties::removePropertiesInSet):
+
 2015-02-10  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/css/StyleProperties.cpp

@@ -1134 +1134 @@
         toRemove.add(set[i]);
 
-    Vector<CSSProperty> newProperties;
-    newProperties.reserveInitialCapacity(m_propertyVector.size());
-
-    unsigned size = m_propertyVector.size();
-    for (unsigned n = 0; n < size; ++n) {
-        const CSSProperty& property = m_propertyVector.at(n);
+    return m_propertyVector.removeAllMatching([&toRemove] (const CSSProperty& property) {
         // Not quite sure if the isImportant test is needed but it matches the existing behavior.
-        if (!property.isImportant()) {
-            if (toRemove.contains(property.id()))
-                continue;
-        }
-        newProperties.append(property);
-    }
-
-    bool changed = newProperties.size() != m_propertyVector.size();
-    m_propertyVector = newProperties;
-    return changed;
+        return !property.isImportant() && toRemove.contains(property.id());
+    }) > 0;
 }