Changeset 152197 in webkit

Timestamp:

Jun 28, 2013 5:01:37 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

Remove unused attachChildrenLazily method and make attach/detachChildren private
​https://bugs.webkit.org/show_bug.cgi?id=118016

Reviewed by Darin Adler.

Merge ​https://chromium.googlesource.com/chromium/blink/+/009520dc31c9458e0cf71cf212fa5688c4ca68b0

No one should be manually trying to attach or detach all their children so there's
no reason for these methods to be public.

In doing this I realized that attachChildrenLazily is not used and can be removed.

I also realized that we were detaching all our children before the ShadowRoots which
is sad since the InsertionPoints will call detach() on them as well, and then when we
call ContainerNode::detach at the end of Element::detach we'll go detach them again!
This patch makes it so we only go through and detach them twice instead of three times.
In the future we should figure out a way to only do this once.

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

(WebCore::Element::detach):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ContainerNode.h (modified) (3 diffs)
• dom/Element.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Remove unused attachChildrenLazily method and make attach/detachChildren private
+        https://bugs.webkit.org/show_bug.cgi?id=118016
+
+        Reviewed by Darin Adler.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/009520dc31c9458e0cf71cf212fa5688c4ca68b0
+
+        No one should be manually trying to attach or detach all their children so there's
+        no reason for these methods to be public.
+        
+        In doing this I realized that attachChildrenLazily is not used and can be removed.
+        
+        I also realized that we were detaching all our children before the ShadowRoots which
+        is sad since the InsertionPoints will call detach() on them as well, and then when we
+        call ContainerNode::detach at the end of Element::detach we'll go detach them again!
+        This patch makes it so we only go through and detach them twice instead of three times.
+        In the future we should figure out a way to only do this once.
+
+        * dom/ContainerNode.h:
+        * dom/Element.cpp:
+        (WebCore::Element::detach):
+
 2013-06-28  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/dom/ContainerNode.h

@@ -119 +119 @@
     virtual void childrenChanged(bool createdByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
 
-    void attachChildren(const AttachContext& = AttachContext());
-    void attachChildrenLazily();
-    void detachChildren(const AttachContext& = AttachContext());
-    void detachChildrenIfNeeded(const AttachContext& = AttachContext());
-
     void disconnectDescendantFrames();
 
@@ -147 +142 @@
     void removeBetween(Node* previousChild, Node* nextChild, Node* oldChild);
     void insertBeforeCommon(Node* nextChild, Node* oldChild);
+
+    void attachChildren(const AttachContext& = AttachContext());
+    void detachChildren(const AttachContext& = AttachContext());
 
     static void dispatchPostAttachCallbacks();
@@ -194 +192 @@
         if (!child->attached())
             child->attach(childrenContext);
-    }
-}
-
-inline void ContainerNode::attachChildrenLazily()
-{
-    for (Node* child = firstChild(); child; child = child->nextSibling())
-        if (!child->attached())
-            child->lazyAttach();
-}
-
-inline void ContainerNode::detachChildrenIfNeeded(const AttachContext& context)
-{
-    AttachContext childrenContext(context);
-    childrenContext.resolvedStyle = 0;
-
-    for (Node* child = firstChild(); child; child = child->nextSibling()) {
-        if (child->attached())
-            child->detach(childrenContext);
     }
 }

trunk/Source/WebCore/dom/Element.cpp

@@ -1479 +1479 @@
     }
 
-    if (ElementShadow* shadow = this->shadow()) {
-        detachChildrenIfNeeded(context);
+    if (ElementShadow* shadow = this->shadow())
         shadow->detach(context);
-    }
 
     // Do not remove the element's hovered and active status