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

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

Index: third_party/WebKit/Source/core/dom/Document.cpp
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index 61ee242baeec2dd8f52f3254cd0c4e4d637014dc..7be02829c1786f52fd78998c63fdd02df9dc70ed 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
@@ -2115,7 +2115,7 @@ 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());
@@ -2127,7 +2127,7 @@ void Document::attachLayoutTree(const AttachContext& context)
     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())
@@ -2143,9 +2143,9 @@ void Document::attachLayoutTree(const AttachContext& context)
     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;
@@ -2212,7 +2212,7 @@ void Document::detachLayoutTree(const AttachContext& context)
         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()) {