Merge ChildNodeInsertionNotifier and ChildNodeRemovalNotifier into ContainerNode

Source/core/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,
  * 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.
  *
  */
 
 #ifndef ContainerNodeAlgorithms_h
 #define ContainerNodeAlgorithms_h
 
 #include "core/dom/Document.h"
-#include "core/dom/ScriptForbiddenScope.h"
-#include "core/inspector/InspectorInstrumentation.h"
 #include "wtf/Assertions.h"
 
 namespace WebCore {
 
-class ChildNodeInsertionNotifier {
-public:
-    explicit ChildNodeInsertionNotifier(ContainerNode& insertionPoint)
-        : m_insertionPoint(insertionPoint)
-    {
-    }
-
-    void notify(Node&);
-
-private:
-    void notifyNodeInserted(Node&);
-
-    ContainerNode& m_insertionPoint;
-    Vector< RefPtr<Node> > m_postInsertionNotificationTargets;
-};
-
-inline void ChildNodeInsertionNotifier::notify(Node& node)
-{
-    ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
-
-    InspectorInstrumentation::didInsertDOMNode(&node);
-
-    RefPtr<Document> protectDocument(node.document());
-    RefPtr<Node> protectNode(node);
-
-    {
-        NoEventDispatchAssertion assertNoEventDispatch;
-        ScriptForbiddenScope forbidScript;
-        notifyNodeInserted(node);
-    }
-
-    for (size_t i = 0; i < m_postInsertionNotificationTargets.size(); ++i) {
-        Node* targetNode = m_postInsertionNotificationTargets[i].get();
-        if (targetNode->inDocument())
-            targetNode->didNotifySubtreeInsertionsToDocument();
-    }
-}
-
-class ChildNodeRemovalNotifier {
-public:
-    explicit ChildNodeRemovalNotifier(ContainerNode& insertionPoint)
-        : m_insertionPoint(insertionPoint)
-    {
-    }
-
-    void notify(Node&);
-
-private:
-    void notifyNodeRemoved(Node&);
-
-    ContainerNode& m_insertionPoint;
-};
-
-inline void ChildNodeRemovalNotifier::notify(Node& node)
-{
-    ScriptForbiddenScope forbidScript;
-    NoEventDispatchAssertion assertNoEventDispatch;
-    notifyNodeRemoved(node);
-}
-
 namespace Private {
 
     template<class GenericNode, class GenericNodeContainer>
     void addChildNodesToDeletionQueue(GenericNode*& head, GenericNode*& tail, GenericNodeContainer&);
 
 }
 
 #if !ENABLE(OILPAN)
 // Helper functions for TreeShared-derived classes, which have a 'Node' style interface
 // This applies to 'ContainerNode' and 'SVGElementInstance'
@@ skipping 52 matching lines @@
             // no-op, by default
         }
     };
 
     template<class GenericNode, class GenericNodeContainer>
     struct NodeRemovalDispatcher<GenericNode, GenericNodeContainer, true> {
         static void dispatch(GenericNode& node, GenericNodeContainer& container)
         {
             container.document().adoptIfNeeded(node);
             if (node.inDocument())
-                ChildNodeRemovalNotifier(container).notify(node);
+                container.notifyNodeRemoved(node);
         }
     };
 
     template<class GenericNode>
     struct ShouldDispatchRemovalNotification {
         static const bool value = false;
     };
 
     template<>
     struct ShouldDispatchRemovalNotification<Node> {
@@ skipping 34 matching lines @@
         }
 
         container.setLastChild(0);
     }
 
 } // namespace Private
 
 } // namespace WebCore
 
 #endif // ContainerNodeAlgorithms_h