Track connected subframes per-Document instead of per-Node.

third_party/WebKit/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, 2013 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/dom/ContainerNode.h"
 
 #include "bindings/core/v8/ExceptionState.h"
-#include "core/dom/ChildFrameDisconnector.h"
 #include "core/dom/ChildListMutationScope.h"
 #include "core/dom/ClassCollection.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/NameNodeList.h"
 #include "core/dom/NodeChildRemovalTracker.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/dom/NodeRareData.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/dom/NthIndexCache.h"
@@ skipping 34 matching lines @@
         return;
     }
     nodes.append(&node);
     if (ContainerNode* oldParent = node.parentNode())
         oldParent->removeChild(&node, exceptionState);
 }
 
 #if !ENABLE(OILPAN)
 void ContainerNode::removeDetachedChildren()
 {
-    ASSERT(!connectedSubframeCount());
     ASSERT(needsAttach());
     removeDetachedChildrenInContainer(*this);
 }
 #endif
 
 void ContainerNode::parserTakeAllChildrenFrom(ContainerNode& oldParent)
 {
     while (RefPtrWillBeRawPtr<Node> child = oldParent.firstChild()) {
         // Explicitly remove since appending can fail, but this loop shouldn't be infinite.
         oldParent.parserRemoveChild(*child);
@@ skipping 228 matching lines @@
 
     if (document() != newChild->document())
         document().adoptNode(newChild.get(), ASSERT_NO_EXCEPTION);
 
     {
         EventDispatchForbiddenScope assertNoEventDispatch;
         ScriptForbiddenScope forbidScript;
 
         treeScope().adoptIfNeeded(*newChild);
         insertBeforeCommon(nextChild, *newChild);
-        newChild->updateAncestorConnectedSubframeCountForInsertion();
+        ASSERT(!document().subframeTracker().hasConnectedSubframes(*newChild));
         ChildListMutationScope(*this).childAdded(*newChild);
     }
 
     notifyNodeInserted(*newChild, ChildrenChangeSourceParser);
 }
 
 PassRefPtrWillBeRawPtr<Node> ContainerNode::replaceChild(PassRefPtrWillBeRawPtr<Node> newChild, PassRefPtrWillBeRawPtr<Node> oldChild, ExceptionState& exceptionState)
 {
 #if !ENABLE(OILPAN)
     // Check that this node is not "floating".
@@ skipping 90 matching lines @@
     dispatchSubtreeModifiedEvent();
     return child;
 }
 
 void ContainerNode::willRemoveChild(Node& child)
 {
     ASSERT(child.parentNode() == this);
     ChildListMutationScope(*this).willRemoveChild(child);
     child.notifyMutationObserversNodeWillDetach();
     dispatchChildRemovalEvents(child);
-    ChildFrameDisconnector(child).disconnect();
+    // TODO(dcheng): Is it possible for document() to be null here?
+    document().subframeTracker().disconnectSubframesAt(child);
     if (document() != child.document()) {
         // |child| was moved another document by DOM mutation event handler.
         return;
     }
 
     // |nodeWillBeRemoved()| must be run after |ChildFrameDisconnector|, because
     // |ChildFrameDisconnector| can run script which may cause state that is to
     // be invalidated by removing the node.
     ScriptForbiddenScope scriptForbiddenScope;
     EventDispatchForbiddenScope assertNoEventDispatch;
     // e.g. mutation event listener can create a new range.
     document().nodeWillBeRemoved(child);
 }
 
 void ContainerNode::willRemoveChildren()
 {
     NodeVector children;
     getChildNodes(*this, children);
 
     ChildListMutationScope mutation(*this);
     for (const auto& node : children) {
         ASSERT(node);
         Node& child = *node;
         mutation.willRemoveChild(child);
         child.notifyMutationObserversNodeWillDetach();
         dispatchChildRemovalEvents(child);
     }
 
-    ChildFrameDisconnector(*this).disconnect(ChildFrameDisconnector::DescendantsOnly);
+    // TODO(dcheng): Is it possible for document() to be null here?
+    document().subframeTracker().disconnectSubframesAt(*this, SubframeTracker::DescendantsOnly);
 }
 
 #if !ENABLE(OILPAN)
 void ContainerNode::removeDetachedChildrenInContainer(ContainerNode& container)
 {
     // List of nodes to be deleted.
     Node* head = nullptr;
     Node* tail = nullptr;
 
     addChildNodesToDeletionQueue(head, tail, container);
@@ skipping 144 matching lines @@
 
     document().adoptIfNeeded(oldChild);
 }
 
 void ContainerNode::parserRemoveChild(Node& oldChild)
 {
     ASSERT(oldChild.parentNode() == this);
     ASSERT(!oldChild.isDocumentFragment());
 
     // This may cause arbitrary Javascript execution via onunload handlers.
-    if (oldChild.connectedSubframeCount())
-        ChildFrameDisconnector(oldChild).disconnect();
+    document().subframeTracker().disconnectSubframesAt(*this);
 
     if (oldChild.parentNode() != this)
         return;
 
     ChildListMutationScope(*this).willRemoveChild(oldChild);
     oldChild.notifyMutationObserversNodeWillDetach();
 
     HTMLFrameOwnerElement::UpdateSuspendScope suspendWidgetHierarchyUpdates;
     DocumentOrderedMap::RemoveScope treeRemoveScope;
 
@@ skipping 153 matching lines @@
 
     if (document() != newChild->document())
         document().adoptNode(newChild.get(), ASSERT_NO_EXCEPTION);
 
     {
         EventDispatchForbiddenScope assertNoEventDispatch;
         ScriptForbiddenScope forbidScript;
 
         treeScope().adoptIfNeeded(*newChild);
         appendChildCommon(*newChild);
-        newChild->updateAncestorConnectedSubframeCountForInsertion();
+        ASSERT(!document().subframeTracker().hasConnectedSubframes(*newChild));
         ChildListMutationScope(*this).childAdded(*newChild);
     }
 
     notifyNodeInserted(*newChild, ChildrenChangeSourceParser);
 }
 
 void ContainerNode::notifyNodeInserted(Node& root, ChildrenChangeSource source)
 {
     ASSERT(!EventDispatchForbiddenScope::isEventDispatchForbidden());
     ASSERT(!root.isShadowRoot());
@@ skipping 688 matching lines @@
         return true;
 
     if (node->isElementNode() && toElement(node)->shadow())
         return true;
 
     return false;
 }
 #endif
 
 } // namespace blink