Changeset 166586 in webkit

Timestamp:

Apr 1, 2014 8:22:36 AM (10 years ago)

Author:

zandobersek@gmail.com

Message:

Avoid unnecessary HashSet copies when calling collectInstancesForSVGElement
​https://bugs.webkit.org/show_bug.cgi?id=131020

Reviewed by Andreas Kling.

Remove collectInstancesForSVGElement() to avoid HashSet copies when assigning a const
HashSet reference to a non-const HashSet reference. Instead, range-based for-loops are
deployed to iterate directly over the const reference to HashSet that's returned by
SVGElement::instancesForElement(). SVGElement::containingShadowRoot() return value
is checked to see if the iteration should be performed in the first place, preserving
the behavior of collectInstancesForSVGElement().

• svg/SVGElement.cpp:

(WebCore::SVGElement::addEventListener):
(WebCore::SVGElement::removeEventListener):
(WebCore::collectInstancesForSVGElement): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/SVGElement.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-01  Zan Dobersek  <zdobersek@igalia.com>
+
+        Avoid unnecessary HashSet copies when calling collectInstancesForSVGElement
+        https://bugs.webkit.org/show_bug.cgi?id=131020
+
+        Reviewed by Andreas Kling.
+
+        Remove collectInstancesForSVGElement() to avoid HashSet copies when assigning a const
+        HashSet reference to a non-const HashSet reference. Instead, range-based for-loops are
+        deployed to iterate directly over the const reference to HashSet that's returned by
+        SVGElement::instancesForElement(). SVGElement::containingShadowRoot() return value
+        is checked to see if the iteration should be performed in the first place, preserving
+        the behavior of collectInstancesForSVGElement().
+
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::addEventListener):
+        (WebCore::SVGElement::removeEventListener):
+        (WebCore::collectInstancesForSVGElement): Deleted.
+
 2014-04-01  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -536 +536 @@
 }
 
-static inline void collectInstancesForSVGElement(SVGElement* element, HashSet<SVGElementInstance*>& instances)
-{
-    ASSERT(element);
-    if (element->containingShadowRoot())
-        return;
-
-    ASSERT(!element->instanceUpdatesBlocked());
-
-    instances = element->instancesForElement();
-}
-
 bool SVGElement::addEventListener(const AtomicString& eventType, PassRefPtr<EventListener> prpListener, bool useCapture)
 {
@@ -555 +544 @@
         return false;
 
+    if (containingShadowRoot())
+        return true;
+
     // Add event listener to all shadow tree DOM element instances
-    HashSet<SVGElementInstance*> instances;
-    collectInstancesForSVGElement(this, instances);    
-    const HashSet<SVGElementInstance*>::const_iterator end = instances.end();
-    for (HashSet<SVGElementInstance*>::const_iterator it = instances.begin(); it != end; ++it) {
-        ASSERT((*it)->shadowTreeElement());
-        ASSERT((*it)->correspondingElement() == this);
-
-        bool result = (*it)->shadowTreeElement()->Node::addEventListener(eventType, listener, useCapture);
+    ASSERT(!element->instanceUpdatesBlocked());
+    for (auto& instance : instancesForElement()) {
+        ASSERT(instance->shadowTreeElement());
+        ASSERT(instance->correspondingElement() == this);
+
+        bool result = instance->shadowTreeElement()->Node::addEventListener(eventType, listener, useCapture);
         ASSERT_UNUSED(result, result);
     }
@@ -572 +562 @@
 bool SVGElement::removeEventListener(const AtomicString& eventType, EventListener* listener, bool useCapture)
 {
-    HashSet<SVGElementInstance*> instances;
-    collectInstancesForSVGElement(this, instances);
-    if (instances.isEmpty())
+    if (containingShadowRoot())
         return Node::removeEventListener(eventType, listener, useCapture);
 
@@ -589 +577 @@
 
     // Remove event listener from all shadow tree DOM element instances
-    const HashSet<SVGElementInstance*>::const_iterator end = instances.end();
-    for (HashSet<SVGElementInstance*>::const_iterator it = instances.begin(); it != end; ++it) {
-        ASSERT((*it)->correspondingElement() == this);
-
-        SVGElement* shadowTreeElement = (*it)->shadowTreeElement();
+    ASSERT(!element->instanceUpdatesBlocked());
+    for (auto& instance : instancesForElement()) {
+        ASSERT(instance->correspondingElement() == this);
+
+        SVGElement* shadowTreeElement = instance->shadowTreeElement();
         ASSERT(shadowTreeElement);