Changeset 99305 in webkit

Timestamp:

Nov 4, 2011 11:34:00 AM (12 years ago)

Author:

adamk@chromium.org

Message:

Reduce refcount churn in ChildListMutationScope
​https://bugs.webkit.org/show_bug.cgi?id=71527

Reviewed by Ryosuke Niwa.

Only the ChildListMutationAccumulator needs to hold a reference to the
target node, and the added/removed children only need be ref'd if a
ChildListMutationAccumulator exists (i.e., if there are interested
observers).

• dom/ChildListMutationScope.cpp:

(WebCore::MutationAccumulationRouter::ChildListMutationAccumulator::enqueueMutationRecord):
(WebCore::MutationAccumulationRouter::MutationAccumulationRouter::childAdded):
(WebCore::MutationAccumulationRouter::MutationAccumulationRouter::willRemoveChild):
(WebCore::ChildListMutationScope::ChildListMutationScope):
(WebCore::ChildListMutationScope::~ChildListMutationScope):
(WebCore::ChildListMutationScope::childAdded):
(WebCore::ChildListMutationScope::willRemoveChild):

• dom/ChildListMutationScope.h:
• dom/ContainerNode.cpp:

(WebCore::dispatchChildInsertionEvents):
(WebCore::dispatchChildRemovalEvents):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ChildListMutationScope.cpp (modified) (5 diffs)
• dom/ChildListMutationScope.h (modified) (2 diffs)
• dom/ContainerNode.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-04  Adam Klein  <adamk@chromium.org>
+
+        Reduce refcount churn in ChildListMutationScope
+        https://bugs.webkit.org/show_bug.cgi?id=71527
+
+        Reviewed by Ryosuke Niwa.
+
+        Only the ChildListMutationAccumulator needs to hold a reference to the
+        target node, and the added/removed children only need be ref'd if a
+        ChildListMutationAccumulator exists (i.e., if there are interested
+        observers).
+
+        * dom/ChildListMutationScope.cpp:
+        (WebCore::MutationAccumulationRouter::ChildListMutationAccumulator::enqueueMutationRecord):
+        (WebCore::MutationAccumulationRouter::MutationAccumulationRouter::childAdded):
+        (WebCore::MutationAccumulationRouter::MutationAccumulationRouter::willRemoveChild):
+        (WebCore::ChildListMutationScope::ChildListMutationScope):
+        (WebCore::ChildListMutationScope::~ChildListMutationScope):
+        (WebCore::ChildListMutationScope::childAdded):
+        (WebCore::ChildListMutationScope::willRemoveChild):
+        * dom/ChildListMutationScope.h:
+        * dom/ContainerNode.cpp:
+        (WebCore::dispatchChildInsertionEvents):
+        (WebCore::dispatchChildRemovalEvents):
+
 2011-11-04  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/dom/ChildListMutationScope.cpp

@@ -87 +87 @@
     void decrementScopingLevel(Node*);
 
-    void childAdded(Node*, PassRefPtr<Node>);
-    void willRemoveChild(Node*, PassRefPtr<Node>);
+    void childAdded(Node* target, Node* child);
+    void willRemoveChild(Node* target, Node* child);
 
 private:
@@ -168 +168 @@
 
     RefPtr<MutationRecord> mutation = MutationRecord::createChildList(
-        m_target, StaticNodeList::adopt(m_addedNodes), StaticNodeList::adopt(m_removedNodes), m_previousSibling, m_nextSibling);
+        m_target, StaticNodeList::adopt(m_addedNodes), StaticNodeList::adopt(m_removedNodes), m_previousSibling.release(), m_nextSibling.release());
 
     for (HashMap<WebKitMutationObserver*, MutationObserverOptions>::iterator iter = m_observers.begin(); iter != m_observers.end(); ++iter)
@@ -219 +219 @@
 }
 
-void MutationAccumulationRouter::childAdded(Node* target, PassRefPtr<Node> child)
+void MutationAccumulationRouter::childAdded(Node* target, Node* child)
 {
     HashMap<Node*, RefPtr<ChildListMutationAccumulator> >::iterator iter = m_accumulations.find(target);
@@ -228 +228 @@
 }
 
-void MutationAccumulationRouter::willRemoveChild(Node* target, PassRefPtr<Node> child)
+void MutationAccumulationRouter::willRemoveChild(Node* target, Node* child)
 {
     HashMap<Node*, RefPtr<ChildListMutationAccumulator> >::iterator iter = m_accumulations.find(target);
@@ -271 +271 @@
 } // namespace
 
-ChildListMutationScope::ChildListMutationScope(PassRefPtr<Node> target)
+ChildListMutationScope::ChildListMutationScope(Node* target)
     : m_target(target)
 {
-    MutationAccumulationRouter::instance()->incrementScopingLevel(m_target.get());
+    MutationAccumulationRouter::instance()->incrementScopingLevel(m_target);
 }
 
 ChildListMutationScope::~ChildListMutationScope()
 {
-    MutationAccumulationRouter::instance()->decrementScopingLevel(m_target.get());
-}
-
-void ChildListMutationScope::childAdded(PassRefPtr<Node> child)
-{
-    MutationAccumulationRouter::instance()->childAdded(m_target.get(), child);
-}
-
-void ChildListMutationScope::willRemoveChild(PassRefPtr<Node> child)
-{
-    MutationAccumulationRouter::instance()->willRemoveChild(m_target.get(), child);
+    MutationAccumulationRouter::instance()->decrementScopingLevel(m_target);
+}
+
+void ChildListMutationScope::childAdded(Node* child)
+{
+    MutationAccumulationRouter::instance()->childAdded(m_target, child);
+}
+
+void ChildListMutationScope::willRemoveChild(Node* child)
+{
+    MutationAccumulationRouter::instance()->willRemoveChild(m_target, child);
 }
 

trunk/Source/WebCore/dom/ChildListMutationScope.h

@@ -35 +35 @@
 
 #include <wtf/Noncopyable.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
 
 namespace WebCore {
@@ -45 +43 @@
     WTF_MAKE_NONCOPYABLE(ChildListMutationScope);
 public:
-    ChildListMutationScope(PassRefPtr<Node> target);
+    ChildListMutationScope(Node* target);
     ~ChildListMutationScope();
 
-    void childAdded(PassRefPtr<Node>);
-    void willRemoveChild(PassRefPtr<Node>);
+    void childAdded(Node*);
+    void willRemoveChild(Node*);
 
 private:
-    RefPtr<Node> m_target;
+    Node* m_target;
 };
 

trunk/Source/WebCore/dom/ContainerNode.cpp

@@ -1116 +1116 @@
     if (c->parentNode()) {
         ChildListMutationScope mutation(c->parentNode());
-        mutation.childAdded(c);
+        mutation.childAdded(c.get());
     }
 #endif
@@ -1144 +1144 @@
     if (c->parentNode()) {
         ChildListMutationScope mutation(c->parentNode());
-        mutation.willRemoveChild(c);
+        mutation.willRemoveChild(c.get());
         c->notifyMutationObserversNodeWillDetach();
     }