Rename attach and detach to createRenderTree/destroyRenderTree

Source/core/dom/ContainerNode.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 79 matching lines @@
             mutation.willRemoveChild(children[i].get());
     }
 
     // FIXME: We need to do notifyMutationObserversNodeWillDetach() for each child,
     // probably inside removeDetachedChildrenInContainer.
 
     oldParent->removeDetachedChildren();
 
     for (unsigned i = 0; i < children.size(); ++i) {
         if (children[i]->attached())
-            children[i]->detach();
+            children[i]->destroyRenderTree();
         // FIXME: We need a no mutation event version of adoptNode.
         RefPtr<Node> child = document().adoptNode(children[i].release(), ASSERT_NO_EXCEPTION);
         // FIXME: Together with adoptNode above, the tree scope might get updated recursively twice
         // (if the document changed or oldParent was in a shadow tree, AND *this is in a shadow tree).
         // Can we do better?
         treeScope().adoptIfNeeded(child.get());
         parserAppendChild(child.get());
     }
 }
 
@@ skipping 380 matching lines @@
 
 void ContainerNode::removeBetween(Node* previousChild, Node* nextChild, Node* oldChild)
 {
     NoEventDispatchAssertion assertNoEventDispatch;
 
     ASSERT(oldChild);
     ASSERT(oldChild->parentNode() == this);
 
     // Remove from rendering tree
     if (oldChild->attached())
-        oldChild->detach();
+        oldChild->destroyRenderTree();
 
     if (nextChild)
         nextChild->setPreviousSibling(previousChild);
     if (previousChild)
         previousChild->setNextSibling(nextChild);
     if (m_firstChild == oldChild)
         m_firstChild = nextChild;
     if (m_lastChild == oldChild)
         m_lastChild = previousChild;
 
@@ skipping 147 matching lines @@
     }
 
     newChild->updateAncestorConnectedSubframeCountForInsertion();
 
     ChildListMutationScope(this).childAdded(newChild.get());
 
     childrenChanged(true, last, 0, 1);
     ChildNodeInsertionNotifier(this).notify(newChild.get());
 }
 
-void ContainerNode::attach(const AttachContext& context)
+void ContainerNode::createRenderTree(const AttachContext& context)
 {
-    attachChildren(context);
+    AttachContext childrenContext(context);
+    childrenContext.resolvedStyle = 0;
+
+    for (Node* child = firstChild(); child; child = child->nextSibling()) {
+        ASSERT(!child->attached() || childAttachedAllowedWhenAttachingChildren(this));
+        if (!child->attached())
+            child->createRenderTree(childrenContext);
+    }
+
     clearChildNeedsStyleRecalc();
-    Node::attach(context);
+    Node::createRenderTree(context);
 }
 
-void ContainerNode::detach(const AttachContext& context)
+void ContainerNode::destroyRenderTree(const AttachContext& context)
 {
-    detachChildren(context);
+    AttachContext childrenContext(context);
+    childrenContext.resolvedStyle = 0;
+
+    for (Node* child = firstChild(); child; child = child->nextSibling())
+        child->destroyRenderTree(childrenContext);
+
     clearChildNeedsStyleRecalc();
-    Node::detach(context);
+    Node::destroyRenderTree(context);
 }
 
 void ContainerNode::childrenChanged(bool changedByParser, Node*, Node*, int childCountDelta)
 {
     document().incDOMTreeVersion();
     if (!changedByParser && childCountDelta)
         document().updateRangesAfterChildrenChanged(this);
     invalidateNodeListCachesInAncestors();
 }
 
@@ skipping 308 matching lines @@
         return true;
 
     if (node->isElementNode() && toElement(node)->shadow())
         return true;
 
     return false;
 }
 #endif
 
 } // namespace WebCore