Implement DOM: prepend, append, before, after & replaceWith

Source/core/dom/Node.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, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 364 matching lines @@
     LayoutObject* layoutObject = m_data.m_rareData->layoutObject();
     if (isElementNode())
         delete static_cast<ElementRareData*>(m_data.m_rareData);
     else
         delete static_cast<NodeRareData*>(m_data.m_rareData);
     m_data.m_layoutObject = layoutObject;
     clearFlag(HasRareDataFlag);
 }
 #endif
 
+PassRefPtrWillBeRawPtr<Node> Node::nodeOrStringToNode(const NodeOrString& nodeOrString)
+{
+    if (nodeOrString.isNode())
+        return nodeOrString.getAsNode();
+    return Text::create(document(), nodeOrString.getAsString());
+}
+
+Node* Node::viablePreviosOrNextSibling(const HeapVector<NodeOrString>& nodes, bool next)

[philipj_slow, 2015/06/25 13:13:23]

The bool argument isn't great. I applied your patch and fiddled a little bit and
came up with this:

static bool isNodeInNodes(const Node& node, const HeapVector<NodeOrString>&
nodes)
{
    for (NodeOrString nodeOrString : nodes) {
        if (nodeOrString.isNode() && nodeOrString.getAsNode() == &node)
            return true;
    }
    return false;
}

static Node* viablePreviousSibling(const Node& node, const
HeapVector<NodeOrString>& nodes)
{
    for (Node* sibling = node.previousSibling(); sibling; sibling =
sibling->previousSibling()) {
        if (!isNodeInNodes(*sibling, nodes))
            return sibling;
    }
    return nullptr;
}

static Node* viableNextSibling(const Node& node, const HeapVector<NodeOrString>&
nodes)
{
    for (Node* sibling = node.nextSibling(); sibling; sibling =
sibling->nextSibling()) {
        if (!isNodeInNodes(*sibling, nodes))
            return sibling;
    }
    return nullptr;
}

WDYT?

[Paritosh Kumar, 2015/06/26 13:14:05]

Yes, It looks great. Thanks.

+{
+    Node* node = next ? this->nextSibling() : this->previousSibling();
+    bool notFound;
+    while (node) {
+        notFound = true;
+        for (NodeOrString nodeOrString : nodes) {
+            if (nodeOrStringToNode(nodeOrString)->isSameNode(node)) {

[philipj_slow, 2015/06/25 13:13:23]

It's a waste to convert string to nodes here, instead check if it's a node and
if so compare it with node. Also just use == as that's exactly what isSameNode
does.

[Paritosh Kumar, 2015/06/26 13:14:06]

Done.

+                notFound = false;
+                break;
+            }
+        }
+        if (notFound)
+            return node;
+        node = next ? node->nextSibling() : node->previousSibling();
+    }
+    return nullptr;
+}
+
+PassRefPtrWillBeRawPtr<Node> Node::convertNodesIntoNode(const HeapVector<NodeOrString>& nodes)
+{
+    if (nodes.size() == 1)
+        return nodeOrStringToNode(nodes[0]);
+
+    RefPtrWillBeRawPtr<Node> node = DocumentFragment::create(document());
+    for (const NodeOrString& nodeOrString : nodes)
+        node->appendChild(nodeOrStringToNode(nodeOrString), ASSERT_NO_EXCEPTION);
+    return node.release();
+}
+
 Node* Node::toNode()
 {
     return this;
 }
 
 short Node::tabIndex() const
 {
     return 0;
 }
 
@@ skipping 99 matching lines @@
 
 PassRefPtrWillBeRawPtr<Node> Node::appendChild(PassRefPtrWillBeRawPtr<Node> newChild, ExceptionState& exceptionState)
 {
     if (isContainerNode())
         return toContainerNode(this)->appendChild(newChild, exceptionState);
 
     exceptionState.throwDOMException(HierarchyRequestError, "This node type does not support this method.");
     return nullptr;
 }
 
+void Node::prepend(const HeapVector<NodeOrString>& nodes, ExceptionState& exceptionState)
+{
+    RefPtrWillBeRawPtr<Node> nodeToPrepend = convertNodesIntoNode(nodes);
+    this->insertBefore(nodeToPrepend, this->firstChild(), exceptionState);
+}
+
+void Node::append(const HeapVector<NodeOrString>& nodes, ExceptionState& exceptionState)
+{
+    RefPtrWillBeRawPtr<Node> nodeToAppend = convertNodesIntoNode(nodes);
+    this->appendChild(nodeToAppend, exceptionState);
+}
+
+void Node::before(const HeapVector<NodeOrString>& nodes, ExceptionState& exceptionState)
+{
+    Node* parent = parentNode();
+    if (!parent)
+        return;
+    Node* viablePreviousSibling = viablePreviosOrNextSibling(nodes, false /* Previous */);
+    RefPtrWillBeRawPtr<Node> nodeToInsert = convertNodesIntoNode(nodes);
+    if (!viablePreviousSibling)
+        parent->insertBefore(nodeToInsert, parent->firstChild(), exceptionState);
+    else
+        parent->insertBefore(nodeToInsert, viablePreviousSibling, exceptionState);
+}
+
+void Node::after(const HeapVector<NodeOrString>& nodes, ExceptionState& exceptionState)
+{
+    Node* parent = parentNode();
+    if (!parent)
+        return;
+    Node* viableNextSibling = viablePreviosOrNextSibling(nodes, true /* Next */);
+    RefPtrWillBeRawPtr<Node> nodeToInsert = convertNodesIntoNode(nodes);
+    parent->insertBefore(nodeToInsert, viableNextSibling, exceptionState);
+}
+
+void Node::replaceWith(const HeapVector<NodeOrString>& nodes, ExceptionState& exceptionState)
+{
+    Node* parent = parentNode();
+    if (!parent)
+        return;
+    Node* viableNextSibling = viablePreviosOrNextSibling(nodes, true /* Next */);

[philipj_slow, 2015/06/25 13:13:23]

Here viableNextSibling and nodeToReplaceWith can be moved into the branches
where they are actually used.

[Paritosh Kumar, 2015/06/26 13:14:06]

Done.

+    RefPtrWillBeRawPtr<Node> nodeToReplaceWith = convertNodesIntoNode(nodes);
+    if (parent == parentNode())
+        parent->replaceChild(nodeToReplaceWith, this, exceptionState);
+    else
+        parent->insertBefore(nodeToReplaceWith, viableNextSibling, exceptionState);
+}
+
 void Node::remove(ExceptionState& exceptionState)
 {
     if (ContainerNode* parent = parentNode())
         parent->removeChild(this, exceptionState);
 }
 
 void Node::normalize()
 {
     updateDistribution();
 
@@ skipping 1988 matching lines @@
 
 void showNodePath(const blink::Node* node)
 {
     if (node)
         node->showNodePathForThis();
     else
         fprintf(stderr, "Cannot showNodePath for (nil)\n");
 }
 
 #endif