Changeset 161142 in webkit

Timestamp:

Dec 30, 2013, 6:47:44 AM (11 years ago)

Author:

Antti Koivisto

Message:

Remove attachChild
​https://bugs.webkit.org/show_bug.cgi?id=126288

Reviewed by Andreas Kling.

• dom/ContainerNode.cpp:

(WebCore::destroyRenderTreeIfNeeded):

Rename detachChild and move the tests here.

(WebCore::ContainerNode::takeAllChildrenFrom):

No need to call attachRenderTree explicitly anymore.

(WebCore::ContainerNode::removeBetween):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ContainerNode.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-30  Antti Koivisto  <antti@apple.com>
+
+        Remove attachChild
+        https://bugs.webkit.org/show_bug.cgi?id=126288
+
+        Reviewed by Andreas Kling.
+
+        * dom/ContainerNode.cpp:
+        (WebCore::destroyRenderTreeIfNeeded):
+        
+            Rename detachChild and move the tests here.
+
+        (WebCore::ContainerNode::takeAllChildrenFrom):
+        
+            No need to call attachRenderTree explicitly anymore.
+
+        (WebCore::ContainerNode::removeBetween):
+
 2013-12-29  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/dom/ContainerNode.cpp

@@ -105 +105 @@
 }
 
-static inline void attachChild(Node& child)
-{
-    if (child.isElementNode())
-        Style::attachRenderTree(toElement(child));
-    else if (child.isTextNode())
-        Style::attachTextRenderer(toText(child));
-}
-
-static inline void detachChild(Node& child)
-{
+static inline void destroyRenderTreeIfNeeded(Node& child)
+{
+    // FIXME: Get rid of the named flow test.
+    if (!child.renderer() && !child.inNamedFlow())
+        return;
     if (child.isElementNode())
         Style::detachRenderTree(toElement(child));
@@ -141 +136 @@
     for (unsigned i = 0; i < children.size(); ++i) {
         Node& child = children[i].get();
-        if (child.renderer())
-            detachChild(child);
+
+        destroyRenderTreeIfNeeded(child);
 
         // FIXME: We need a no mutation event version of adoptNode.
@@ -151 +146 @@
         // Can we do better?
         treeScope().adoptIfNeeded(adoptedChild.get());
-        if (renderer() && !adoptedChild->renderer())
-            attachChild(*adoptedChild.get());
     }
 }
@@ -594 +587 @@
     ASSERT(oldChild.parentNode() == this);
 
-    // Remove from rendering tree
-    // FIXME: Get rid of the named flow test.
-    if (oldChild.renderer() || oldChild.inNamedFlow())
-        detachChild(oldChild);
+    destroyRenderTreeIfNeeded(oldChild);
 
     if (nextChild)