Rename Document::attach/detachLayoutTree to Document::initialize/shutdown

third_party/WebKit/Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 2097 matching lines @@
 StyleResolver* Document::styleResolver() const
 {
     return m_styleEngine->resolver();
 }
 
 StyleResolver& Document::ensureStyleResolver() const
 {
     return m_styleEngine->ensureResolver();
 }
 
-void Document::attachLayoutTree(const AttachContext& context)
+void Document::initialize()
 {
     DCHECK_EQ(m_lifecycle.state(), DocumentLifecycle::Inactive);
     DCHECK(!m_axObjectCache || this != &axObjectCacheOwner());
 
     m_layoutView = new LayoutView(this);
     setLayoutObject(m_layoutView);
 
     m_layoutView->setIsInWindow(true);
     m_layoutView->setStyle(StyleResolver::styleForDocument(*this));
     m_layoutView->compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCompositingInputChange);
 
-    ContainerNode::attachLayoutTree(context);
+    ContainerNode::attachLayoutTree(AttachContext());

[esprehn, 2016/09/08 01:16:27]

There's a default argument, you can just do ContainerNode::attachLayoutTree()
without the argument

 
     // The TextAutosizer can't update layout view info while the Document is detached, so update now in case anything changed.
     if (TextAutosizer* autosizer = textAutosizer())
         autosizer->updatePageInfo();
 
     m_frame->selection().documentAttached(this);
     m_lifecycle.advanceTo(DocumentLifecycle::StyleClean);
 
     if (view())
         view()->didAttachDocument();
 
     // Needs to be called after view()->didAttachDocument().
     m_rootScrollerController->didAttachDocument();
 }
 
-void Document::detachLayoutTree(const AttachContext& context)
+void Document::shutdown()
 {
-    TRACE_EVENT0("blink", "Document::detach");
+    TRACE_EVENT0("blink", "Document::shutdown");
     RELEASE_ASSERT(!m_frame || m_frame->tree().childCount() == 0);
     if (!isActive())
         return;
 
     // Frame navigation can cause a new Document to be attached. Don't allow that, since that will
     // cause a situation where LocalFrame still has a Document attached after this finishes!
     // Normally, it shouldn't actually be possible to trigger navigation here. However, plugins
     // (see below) can cause lots of crazy things to happen, since plugin detach involves nested
     // message loops.
     FrameNavigationDisabler navigationDisabler(*m_frame);
@@ skipping 46 matching lines @@
         m_focusedElement = nullptr;
         if (frameHost())
             frameHost()->chromeClient().focusedNodeChanged(oldFocusedElement, nullptr);
     }
     m_sequentialFocusNavigationStartingPoint = nullptr;
 
     if (this == &axObjectCacheOwner())
         clearAXObjectCache();
 
     m_layoutView = nullptr;
-    ContainerNode::detachLayoutTree(context);
+    ContainerNode::detachLayoutTree(AttachContext());

[esprehn, 2016/09/08 01:16:27]

ditto

 
     if (this != &axObjectCacheOwner()) {
         if (AXObjectCache* cache = existingAXObjectCache()) {
             // Documents that are not a root document use the AXObjectCache in
             // their root document. Node::removedFrom is called after the
             // document has been detached so it can't find the root document.
             // We do the removals here instead.
             for (Node& node : NodeTraversal::descendantsOf(*this)) {
                 cache->remove(&node);
             }
@@ skipping 3823 matching lines @@
 }
 
 void showLiveDocumentInstances()
 {
     WeakDocumentSet& set = liveDocumentSet();
     fprintf(stderr, "There are %u documents currently alive:\n", set.size());
     for (Document* document : set)
         fprintf(stderr, "- Document %p URL: %s\n", document, document->url().getString().utf8().data());
 }
 #endif