Node.insertBefore and Node.appendChild do not use custom binding anymore

Source/core/dom/ContainerNode.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
  *
  * 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.
@@ skipping 159 matching lines @@
 bool ContainerNode::checkAcceptChildGuaranteedNodeTypes(const Node& newChild, ExceptionState& exceptionState) const
 {
     ASSERT(isChildTypeAllowed(newChild));
     if (newChild.contains(this)) {
         exceptionState.throwDOMException(HierarchyRequestError, "The new child element contains the parent.");
         return false;
     }
     return true;
 }
 
-void ContainerNode::insertBefore(PassRefPtrWillBeRawPtr<Node> newChild, Node* refChild, ExceptionState& exceptionState)
+Node* ContainerNode::sameNode(Node* node)

[Jens Widell, 2014/07/10 09:14:54]

I don't see why this is necessary, and performance-wise it'd be an absolute
disaster.

[kangil_, 2014/07/11 02:09:26]

Done.

+{
+    for (Node* child = firstChild(); child; child = child->nextSibling()) {
+        if (child->isSameNode(node)) {
+            return child;
+        }
+    }
+    return nullptr;
+}
+
+PassRefPtrWillBeRawPtr<Node> ContainerNode::insertBefore(PassRefPtrWillBeRawPtr<Node> newChild, Node* refChild, ExceptionState& exceptionState)

[haraken, 2014/07/10 09:16:02]

insertBefore is in hot call paths. Calling sameNode() wouldn't be acceptable for
performance.

Why can't you just make insertBefore return |newNode|?

[kangil_, 2014/07/11 02:09:26]

Done.

 {
 #if !ENABLE(OILPAN)
     // Check that this node is not "floating".
     // If it is, it can be deleted as a side effect of sending mutation events.
     ASSERT(refCount() || parentOrShadowHostNode());
 #endif
 
     RefPtrWillBeRawPtr<Node> protect(this);
 
     // insertBefore(node, 0) is equivalent to appendChild(node)
     if (!refChild) {
         appendChild(newChild, exceptionState);

[Jens Widell, 2014/07/10 09:18:27]

We could deal with appendChild(), replaceChild() and removeChild() in the same
patch, I think, in which case this line should just be

  return appendChild(newChild, exceptionState);

[kangil_, 2014/07/11 02:09:26]

insertBefore() and appendChild() implementations are associated with.
So I would implement two methods here.
replaceChild() and removeChild() are associated so I will do same in follow
patch.

-        return;
+        return lastChild();

[Jens Widell, 2014/07/10 09:14:54]

You should just return 'newChild' everywhere (or nullptr if an exception was
thrown, although in that case it doesn't really matter.)

[kangil_, 2014/07/11 02:09:26]

Done.

     }
 
     // Make sure adding the new child is OK.
     if (!checkAcceptChild(newChild.get(), 0, exceptionState))
-        return;
+        return nullptr;
     ASSERT(newChild);
 
     // NotFoundError: Raised if refChild is not a child of this node
     if (refChild->parentNode() != this) {
         exceptionState.throwDOMException(NotFoundError, "The node before which the new node is to be inserted is not a child of this node.");
-        return;
+        return nullptr;
     }
 
-    if (refChild->previousSibling() == newChild || refChild == newChild) // nothing to do
-        return;
+    // nothing to do
+    if (refChild->previousSibling() == newChild || refChild == newChild)
+        return sameNode(newChild.get());
 
     RefPtrWillBeRawPtr<Node> next = refChild;
 
     NodeVector targets;
     collectChildrenAndRemoveFromOldParent(*newChild, targets, exceptionState);
     if (exceptionState.hadException())
-        return;
+        return nullptr;
     if (targets.isEmpty())
-        return;
+        return sameNode(newChild.get());
 
     // We need this extra check because collectChildrenAndRemoveFromOldParent() can fire mutation events.
     if (!checkAcceptChildGuaranteedNodeTypes(*newChild, exceptionState))
-        return;
+        return nullptr;
 
     InspectorInstrumentation::willInsertDOMNode(this);
 
     ChildListMutationScope mutation(*this);
     for (NodeVector::const_iterator it = targets.begin(); it != targets.end(); ++it) {
         ASSERT(*it);
         Node& child = **it;
 
         // Due to arbitrary code running in response to a DOM mutation event it's
         // possible that "next" is no longer a child of "this".
         // It's also possible that "child" has been inserted elsewhere.
         // In either of those cases, we'll just stop.
         if (next->parentNode() != this)
             break;
         if (child.parentNode())
             break;
 
         treeScope().adoptIfNeeded(child);
 
         insertBeforeCommon(*next, child);
 
         updateTreeAfterInsertion(child);
     }
 
     dispatchSubtreeModifiedEvent();
+
+    return sameNode(newChild.get());
 }
 
 void ContainerNode::insertBeforeCommon(Node& nextChild, Node& newChild)
 {
     NoEventDispatchAssertion assertNoEventDispatch;
     ScriptForbiddenScope forbidScript;
 
     ASSERT(!newChild.parentNode()); // Use insertBefore if you need to handle reparenting (and want DOM mutation events).
     ASSERT(!newChild.nextSibling());
     ASSERT(!newChild.previousSibling());
@@ skipping 1037 matching lines @@
         return true;
 
     if (node->isElementNode() && toElement(node)->shadow())
         return true;
 
     return false;
 }
 #endif
 
 } // namespace WebCore