webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 5 insertions, 235 deletions

diff --git a/Source/WebCore/dom/ContainerNodeAlgorithms.h b/Source/WebCore/dom/ContainerNodeAlgorithms.h
index cea04980a..611a0444b 100644
--- a/Source/WebCore/dom/ContainerNodeAlgorithms.h
+++ b/Source/WebCore/dom/ContainerNodeAlgorithms.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2015 Apple Inc. All rights reserved.
  *           (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * This library is free software; you can redistribute it and/or
@@ -19,248 +19,20 @@
  *
  */
 
-#ifndef ContainerNodeAlgorithms_h
-#define ContainerNodeAlgorithms_h
+#pragma once
 
 #include "Document.h"
 #include "ElementIterator.h"
 #include "Frame.h"
-#include "HTMLFrameOwnerElement.h"
-#include "InspectorInstrumentation.h"
 #include "NodeTraversal.h"
-#include "ShadowRoot.h"
 #include <wtf/Assertions.h>
 #include <wtf/Ref.h>
 
 namespace WebCore {
 
-class ChildNodeInsertionNotifier {
-public:
-    explicit ChildNodeInsertionNotifier(ContainerNode& insertionPoint)
-        : m_insertionPoint(insertionPoint)
-    {
-    }
-
-    void notify(Node&);
-
-private:
-    void notifyDescendantInsertedIntoDocument(ContainerNode&);
-    void notifyDescendantInsertedIntoTree(ContainerNode&);
-    void notifyNodeInsertedIntoDocument(Node&);
-    void notifyNodeInsertedIntoTree(ContainerNode&);
-
-    ContainerNode& m_insertionPoint;
-    Vector<Ref<Node>> m_postInsertionNotificationTargets;
-};
-
-class ChildNodeRemovalNotifier {
-public:
-    explicit ChildNodeRemovalNotifier(ContainerNode& insertionPoint)
-        : m_insertionPoint(insertionPoint)
-    {
-    }
-
-    void notify(Node&);
-
-private:
-    void notifyDescendantRemovedFromDocument(ContainerNode&);
-    void notifyDescendantRemovedFromTree(ContainerNode&);
-    void notifyNodeRemovedFromDocument(Node&);
-    void notifyNodeRemovedFromTree(ContainerNode&);
-
-    ContainerNode& m_insertionPoint;
-};
-
-namespace Private {
-
-    template<class GenericNode, class GenericNodeContainer>
-    void addChildNodesToDeletionQueue(GenericNode*& head, GenericNode*& tail, GenericNodeContainer&);
-
-}
-
-// Helper functions for TreeShared-derived classes, which have a 'Node' style interface
-// This applies to 'ContainerNode' and 'SVGElementInstance'
-template<class GenericNode, class GenericNodeContainer>
-inline void removeDetachedChildrenInContainer(GenericNodeContainer& container)
-{
-    // List of nodes to be deleted.
-    GenericNode* head = 0;
-    GenericNode* tail = 0;
-
-    Private::addChildNodesToDeletionQueue<GenericNode, GenericNodeContainer>(head, tail, container);
-
-    GenericNode* n;
-    GenericNode* next;
-    while ((n = head) != 0) {
-        ASSERT(n->m_deletionHasBegun);
-
-        next = n->nextSibling();
-        n->setNextSibling(0);
-
-        head = next;
-        if (next == 0)
-            tail = 0;
-
-        if (n->hasChildNodes())
-            Private::addChildNodesToDeletionQueue<GenericNode, GenericNodeContainer>(head, tail, *static_cast<GenericNodeContainer*>(n));
-
-        delete n;
-    }
-}
-
-template<class GenericNode, class GenericNodeContainer>
-inline void appendChildToContainer(GenericNode* child, GenericNodeContainer& container)
-{
-    child->setParentNode(&container);
-
-    GenericNode* lastChild = container.lastChild();
-    if (lastChild) {
-        child->setPreviousSibling(lastChild);
-        lastChild->setNextSibling(child);
-    } else
-        container.setFirstChild(child);
-
-    container.setLastChild(child);
-}
-
-// Helper methods for removeDetachedChildrenInContainer, hidden from WebCore namespace
-namespace Private {
-
-    template<class GenericNode, class GenericNodeContainer, bool dispatchRemovalNotification>
-    struct NodeRemovalDispatcher {
-        static void dispatch(GenericNode&, GenericNodeContainer&)
-        {
-            // no-op, by default
-        }
-    };
-
-    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())
-                ChildNodeRemovalNotifier(container).notify(node);
-        }
-    };
-
-    template<class GenericNode>
-    struct ShouldDispatchRemovalNotification {
-        static const bool value = false;
-    };
-
-    template<>
-    struct ShouldDispatchRemovalNotification<Node> {
-        static const bool value = true;
-    };
-
-    template<class GenericNode, class GenericNodeContainer>
-    void addChildNodesToDeletionQueue(GenericNode*& head, GenericNode*& tail, GenericNodeContainer& container)
-    {
-        // We have to tell all children that their parent has died.
-        GenericNode* next = 0;
-        for (GenericNode* n = container.firstChild(); n != 0; n = next) {
-            ASSERT(!n->m_deletionHasBegun);
-
-            next = n->nextSibling();
-            n->setNextSibling(0);
-            n->setParentNode(0);
-            container.setFirstChild(next);
-            if (next)
-                next->setPreviousSibling(0);
-
-            if (!n->refCount()) {
-#ifndef NDEBUG
-                n->m_deletionHasBegun = true;
-#endif
-                // 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 {
-                Ref<GenericNode> protect(*n); // removedFromDocument may remove remove all references to this node.
-                NodeRemovalDispatcher<GenericNode, GenericNodeContainer, ShouldDispatchRemovalNotification<GenericNode>::value>::dispatch(*n, container);
-            }
-        }
-
-        container.setLastChild(0);
-    }
-
-} // namespace Private
-
-inline void ChildNodeInsertionNotifier::notifyNodeInsertedIntoDocument(Node& node)
-{
-    ASSERT(m_insertionPoint.inDocument());
-    Ref<Node> protect(node);
-    if (Node::InsertionShouldCallDidNotifySubtreeInsertions == node.insertedInto(m_insertionPoint))
-        m_postInsertionNotificationTargets.append(node);
-    if (node.isContainerNode())
-        notifyDescendantInsertedIntoDocument(toContainerNode(node));
-}
-
-inline void ChildNodeInsertionNotifier::notifyNodeInsertedIntoTree(ContainerNode& node)
-{
-    NoEventDispatchAssertion assertNoEventDispatch;
-    ASSERT(!m_insertionPoint.inDocument());
-
-    if (Node::InsertionShouldCallDidNotifySubtreeInsertions == node.insertedInto(m_insertionPoint))
-        m_postInsertionNotificationTargets.append(node);
-    notifyDescendantInsertedIntoTree(node);
-}
-
-inline void ChildNodeInsertionNotifier::notify(Node& node)
-{
-    ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
-
-#if ENABLE(INSPECTOR)
-    InspectorInstrumentation::didInsertDOMNode(&node.document(), &node);
-#endif
-
-    Ref<Document> protectDocument(node.document());
-    Ref<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));
-}
-
-inline void ChildNodeRemovalNotifier::notifyNodeRemovedFromTree(ContainerNode& node)
-{
-    NoEventDispatchAssertion assertNoEventDispatch;
-    ASSERT(!m_insertionPoint.inDocument());
-
-    node.removedFrom(m_insertionPoint);
-    notifyDescendantRemovedFromTree(node);
-}
-
-inline void ChildNodeRemovalNotifier::notify(Node& node)
-{
-    if (node.inDocument()) {
-        notifyNodeRemovedFromDocument(node);
-        node.document().notifyRemovePendingSheetIfNeeded();
-    } else if (node.isContainerNode())
-        notifyNodeRemovedFromTree(toContainerNode(node));
-}
+void notifyChildNodeInserted(ContainerNode& insertionPoint, Node&, NodeVector& postInsertionNotificationTargets);
+void notifyChildNodeRemoved(ContainerNode& insertionPoint, Node&);
+void removeDetachedChildrenInContainer(ContainerNode&);
 
 enum SubframeDisconnectPolicy {
     RootAndDescendants,
@@ -276,5 +48,3 @@ inline void disconnectSubframesIfNeeded(ContainerNode& root, SubframeDisconnectP
 }
 
 } // namespace WebCore
-
-#endif // ContainerNodeAlgorithms_h