Merge 126131

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 28 matching lines @@
     void notifyInsertedIntoDocument(Node*);
     void notify(Node*);
 
 private:
     void notifyDescendantInsertedIntoDocument(ContainerNode*);
     void notifyDescendantInsertedIntoTree(ContainerNode*);
     void notifyNodeInsertedIntoDocument(Node*);
     void notifyNodeInsertedIntoTree(ContainerNode*);
 
     ContainerNode* m_insertionPoint;
+    Vector< RefPtr<Node> > m_postInsertionNotificationTargets;
 };
 
 class ChildNodeRemovalNotifier {
 public:
     explicit ChildNodeRemovalNotifier(ContainerNode* insertionPoint)
         : m_insertionPoint(insertionPoint)
     {
     }
 
     void notify(Node*);
@@ skipping 131 matching lines @@
 
 inline void ChildNodeInsertionNotifier::notifyNodeInsertedIntoDocument(Node* node)
 {
     ASSERT(m_insertionPoint->inDocument());
     RefPtr<Node> protect(node);
     Node::InsertionNotificationRequest request = node->insertedInto(m_insertionPoint);
 
     if (node->isContainerNode())
         notifyDescendantInsertedIntoDocument(toContainerNode(node));
 
-    if (request == Node::InsertionShouldCallDidNotifyDescendantInsertions)
+    switch (request) {
+    case Node::InsertionDone:
+        break;
+    case Node::InsertionShouldCallDidNotifyDescendantInsertions:
         node->didNotifyDescendantInsertions(m_insertionPoint);
+        break;
+    case Node::InsertionShouldCallDidNotifySubtreeInsertions:
+        m_postInsertionNotificationTargets.append(node);
+        break;
+    }
 }
 
 inline void ChildNodeInsertionNotifier::notifyNodeInsertedIntoTree(ContainerNode* node)
 {
     ASSERT(!m_insertionPoint->inDocument());
     forbidEventDispatch();
 
     Node::InsertionNotificationRequest request = node->insertedInto(m_insertionPoint);
 
     notifyDescendantInsertedIntoTree(node);
@@ skipping 16 matching lines @@
     InspectorInstrumentation::didInsertDOMNode(node->document(), node);
 #endif
 
     RefPtr<Document> protectDocument(node->document());
     RefPtr<Node> protectNode(node);
 
     if (m_insertionPoint->inDocument())
         notifyNodeInsertedIntoDocument(node);
     else if (node->isContainerNode())
         notifyNodeInsertedIntoTree(toContainerNode(node));
+
+    for (size_t i = 0; i < m_postInsertionNotificationTargets.size(); ++i)
+        m_postInsertionNotificationTargets[i]->didNotifySubtreeInsertions(m_insertionPoint);
 }
 
 
 inline void ChildNodeRemovalNotifier::notifyNodeRemovedFromDocument(Node* node)
 {
     ASSERT(m_insertionPoint->inDocument());
     node->removedFrom(m_insertionPoint);
 
     if (node->isContainerNode())
         notifyDescendantRemovedFromDocument(toContainerNode(node));
@@ skipping 71 matching lines @@
     for (unsigned i = 0; i < size; ++i) {
         Target& target = m_list[i];
         if (target.isValid())
             target.disconnect();
     }
 }
 
 } // namespace WebCore
 
 #endif // ContainerNodeAlgorithms_h