Merge 127534

Source/WebCore/dom/ContainerNodeAlgorithms.h

 /*
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  *           (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * 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,
@@ skipping 263 matching lines @@
 {
     if (node->inDocument()) {
         notifyNodeRemovedFromDocument(node);
         node->document()->notifyRemovePendingSheetIfNeeded();
     } else if (node->isContainerNode())
         notifyNodeRemovedFromTree(toContainerNode(node));
 }
 
 class ChildFrameDisconnector {
 public:
-    explicit ChildFrameDisconnector(Node* root);
+    enum ShouldIncludeRoot {
+        DoNotIncludeRoot,
+        IncludeRoot
+    };
+
+    explicit ChildFrameDisconnector(Node* root, ShouldIncludeRoot shouldIncludeRoot = IncludeRoot)
+        : m_root(root)
+    {
+        collectDescendant(m_root, shouldIncludeRoot);
+        rootNodes().add(m_root);
+    }
+
+    ~ChildFrameDisconnector()
+    {
+        rootNodes().remove(m_root);
+    }
+
     void disconnect();
 
+    static bool nodeHasDisconnector(Node*);
+
 private:
-    void collectDescendant(Node* root);
+    void collectDescendant(Node* root, ShouldIncludeRoot);
     void collectDescendant(ElementShadow*);
 
+    static HashSet<Node*>& rootNodes()
+    {
+        DEFINE_STATIC_LOCAL(HashSet<Node*>, nodes, ());
+        return nodes;
+    }
+
     class Target {
     public:
         Target(HTMLFrameOwnerElement* element)
             : m_owner(element)
             , m_ownerParent(element->parentNode())
         {
         }
 
         bool isValid() const { return m_owner->parentNode() == m_ownerParent; }
         void disconnect();
 
     private:
         RefPtr<HTMLFrameOwnerElement> m_owner;
         ContainerNode* m_ownerParent;
     };
 
     Vector<Target, 10> m_list;
+    Node* m_root;
 };
 
-inline ChildFrameDisconnector::ChildFrameDisconnector(Node* root)
+inline void ChildFrameDisconnector::collectDescendant(Node* root, ShouldIncludeRoot shouldIncludeRoot)
 {
-    collectDescendant(root);
-}
-
-inline void ChildFrameDisconnector::collectDescendant(Node* root)
-{
-    for (Node* node = root; node; node = node->traverseNextNode(root)) {
+    for (Node* node = shouldIncludeRoot == IncludeRoot ? root : root->firstChild(); node;
+            node = node->traverseNextNode(root)) {
         if (!node->isElementNode())
             continue;
         Element* element = toElement(node);
         if (element->hasCustomCallbacks() && element->isFrameOwnerElement())
             m_list.append(toFrameOwnerElement(element));
         if (ElementShadow* shadow = element->shadow())
             collectDescendant(shadow);
     }
 }
 
 inline void ChildFrameDisconnector::disconnect()
 {
     unsigned size = m_list.size();
     for (unsigned i = 0; i < size; ++i) {
         Target& target = m_list[i];
         if (target.isValid())
             target.disconnect();
     }
 }
 
+inline bool ChildFrameDisconnector::nodeHasDisconnector(Node* node)
+{
+    HashSet<Node*>& nodes = rootNodes();
+
+    if (nodes.isEmpty())
+        return false;
+
+    for (; node; node = node->parentNode())
+        if (nodes.contains(node))
+            return true;
+
+    return false;
+}
+
 } // namespace WebCore
 
 #endif // ContainerNodeAlgorithms_h