Rename attach and detach to createRenderTree/destroyRenderTree

Source/core/dom/Node.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, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 727 matching lines @@
         setFlag(NotifyRendererWithIdenticalStyles);
 
     StyleChangeType existingChangeType = styleChangeType();
     if (changeType > existingChangeType)
         setStyleChange(changeType);
 
     if (existingChangeType == NoStyleChange)
         markAncestorsWithChildNeedsStyleRecalc();
 }
 
-void Node::lazyAttach()
+void Node::scheduleRenderTreeCreation()
 {
     markAncestorsWithChildNeedsStyleRecalc();
     for (Node* node = this; node; node = NodeTraversal::next(node, this)) {
         node->setAttached();
-        node->setStyleChange(LazyAttachStyleChange);
+        node->setStyleChange(DeferredRenderTreeCreationStyleChange);
         if (node->isContainerNode())
             node->setChildNeedsStyleRecalc();
         for (ShadowRoot* root = node->youngestShadowRoot(); root; root = root->olderShadowRoot())
-            root->lazyAttach();
+            root->scheduleRenderTreeCreation();
     }
 }
 
 Node* Node::focusDelegate()
 {
     return this;
 }
 
 bool Node::shouldHaveFocusAppearance() const
 {
@@ skipping 168 matching lines @@
         if (node == this)
             return true;
         if (node->isDocumentFragment() && toDocumentFragment(node)->isTemplateContent())
             node = static_cast<const TemplateContentDocumentFragment*>(node)->host();
         else
             node = node->parentOrShadowHostNode();
     }
     return false;
 }
 
-inline void Node::detachNode(Node* root, const AttachContext& context)
+inline void Node::destroyRenderTreeForNode(Node* root, const AttachContext& context)
 {
     Node* node = root;
     while (node) {
-        if (node->styleChangeType() == LazyAttachStyleChange) {
-            // FIXME: This is needed because Node::lazyAttach marks nodes as being attached even
+        if (node->styleChangeType() == DeferredRenderTreeCreationStyleChange) {
+            // FIXME: This is needed because Node::scheduleRenderTreeCreation marks nodes as being attached even
             // though they've never been through attach(). This allows us to avoid doing all the
             // virtual calls to detach() and other associated work.
             node->clearAttached();
             node->clearChildNeedsStyleRecalc();
 
             for (ShadowRoot* shadowRoot = node->youngestShadowRoot(); shadowRoot; shadowRoot = shadowRoot->olderShadowRoot())
-                detachNode(shadowRoot, context);
+                destroyRenderTreeForNode(shadowRoot, context);
 
             node = NodeTraversal::next(node, root);
             continue;
         }
         // Handle normal reattaches from style recalc (ex. display type changes)
         if (node->attached())
-            node->detach(context);
+            node->destroyRenderTree(context);
         node = NodeTraversal::nextSkippingChildren(node, root);
     }
 }
 
-void Node::reattach(const AttachContext& context)
+void Node::recreateRenderTree(const AttachContext& context)
 {
     AttachContext reattachContext(context);
-    reattachContext.performingReattach = true;
+    reattachContext.reconstructingRenderTree = true;
 
-    detachNode(this, reattachContext);
-    attach(reattachContext);
+    destroyRenderTreeForNode(this, reattachContext);
+    createRenderTree(reattachContext);
 }
 
-void Node::attach(const AttachContext&)
+void Node::createRenderTree(const AttachContext&)
 {
     ASSERT(document().inStyleRecalc() || isDocumentNode());
     ASSERT(!attached());
     ASSERT(!renderer() || (renderer()->style() && (renderer()->parent() || renderer()->isRenderView())));
 
     setAttached();
     clearNeedsStyleRecalc();
 
     if (Document* doc = documentInternal()) {
         if (AXObjectCache* cache = doc->axObjectCache())
             cache->updateCacheAfterNodeIsAttached(this);
     }
 }
 
 #ifndef NDEBUG
 static Node* detachingNode;
 
 bool Node::inDetach() const
 {
     return detachingNode == this;
 }
 #endif
 
-void Node::detach(const AttachContext& context)
+void Node::destroyRenderTree(const AttachContext& context)
 {
 #ifndef NDEBUG
     ASSERT(!detachingNode);
     detachingNode = this;
 #endif
 
     if (renderer())
         renderer()->destroyAndCleanupAnonymousWrappers();
     setRenderer(0);
 
     // Do not remove the element's hovered and active status
     // if performing a reattach.
-    if (!context.performingReattach) {
+    if (!context.reconstructingRenderTree) {
         Document& doc = document();
         if (isUserActionElement()) {
             if (hovered())
                 doc.hoveredNodeDetached(this);
             if (inActiveChain())
                 doc.activeChainNodeDetached(this);
             doc.userActionElements().didDetach(this);
         }
     }
 
@@ skipping 1628 matching lines @@
         node->showTreeForThis();
 }
 
 void showNodePath(const WebCore::Node* node)
 {
     if (node)
         node->showNodePathForThis();
 }
 
 #endif