Merge 113852

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 65 matching lines @@
         lastChild->setNextSibling(child);
     } else
         container->setFirstChild(child);
 
     container->setLastChild(child);
 }
 
 // Helper methods for removeAllChildrenInContainer, hidden from WebCore namespace
 namespace Private {
 
-    template<class GenericNode, bool dispatchRemovalNotification>
+    template<class GenericNode, class GenericNodeContainer, bool dispatchRemovalNotification>
     struct NodeRemovalDispatcher {
-        static void dispatch(GenericNode*)
+        static void dispatch(GenericNode*, GenericNodeContainer*)
         {
             // no-op, by default
         }
     };
 
-    template<class GenericNode>
-    struct NodeRemovalDispatcher<GenericNode, true> {
-        static void dispatch(GenericNode* node)
+    template<class GenericNode, class GenericNodeContainer>
+    struct NodeRemovalDispatcher<GenericNode, GenericNodeContainer, true> {
+        static void dispatch(GenericNode* node, GenericNodeContainer* container)
         {
+            // Clean up any TreeScope to a removed tree.
+            if (Document* containerDocument = container->ownerDocument())
+                containerDocument->adoptIfNeeded(node);
             if (node->inDocument())
                 node->removedFromDocument();
         }
     };
 
     template<class GenericNode>
     struct ShouldDispatchRemovalNotification {
         static const bool value = false;
     };
 
@@ skipping 22 matching lines @@
                 // Add the node to the list of nodes to be deleted.
                 // Reuse the nextSibling pointer for this purpose.
                 if (tail)
                     tail->setNextSibling(n);
                 else
                     head = n;
 
                 tail = n;
             } else {
                 RefPtr<GenericNode> protect(n); // removedFromDocument may remove remove all references to this node.
-                NodeRemovalDispatcher<GenericNode, ShouldDispatchRemovalNotification<GenericNode>::value>::dispatch(n);
+                NodeRemovalDispatcher<GenericNode, GenericNodeContainer, ShouldDispatchRemovalNotification<GenericNode>::value>::dispatch(n, container);
             }
         }
 
         container->setFirstChild(0);
         container->setLastChild(0);
     }
 };
 
 } // namespace WebCore
 
 #endif // ContainerNodeAlgorithms_h