Morph the APIs for Node, ParentNode, and Element closer to the specs

sky/engine/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 361 matching lines @@
 
 PassRefPtr<Node> Node::appendChild(PassRefPtr<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;
 }
 
+Element* Node::previousElementSibling()
+{
+    return ElementTraversal::previousSibling(*this);
+}
+
+Element* Node::nextElementSibling()
+{
+    return ElementTraversal::nextSibling(*this);
+}
+
+void Node::newInsertBefore(Vector<RefPtr<Node>>& nodes, ExceptionState& es)
+{
+    RefPtr<Node> protect(this);
+    for (auto& node : nodes) {
+        ContainerNode* parent = parentNode();
+        if (!parent)
+            return;
+        parent->insertBefore(node.release(), this, es);
+        if (es.had_exception())
+            return;
+    }
+}
+
+void Node::newInsertAfter(Vector<RefPtr<Node>>& nodes, ExceptionState& es)
+{
+    RefPtr<Node> protect(this);
+    ScriptForbiddenScope scope;
+    Node* refNode = this;
+    for (auto& node : nodes) {
+        ContainerNode* parent = refNode->parentNode();

[esprehn, 2015/02/14 01:50:08]

You don't need to keep checking parent node like this, script can't run in here.

RefPtr<Node> reference = m_next;
for (auto& node : nodes) {
  parent()->insertBefore(node, reference);
}

I think is enough?

+        if (!parent)
+            return;
+        Node* nextRefNode = node.get()
+        parent->insertBefore(node.release(), refNode, es);
+        if (es.had_exception())
+            return;
+        refNode = nextRefNode;
+    }
+}
+
+void Node::replaceWith(Vector<RefPtr<Node>>& nodes, ExceptionState& es)
+{
+    if (RefPtr<Node> next = m_next) {
+        remove(es);
+        if (es.had_exception())
+            return;
+        next->newInsertBefore(nodes, es);
+    } else if (RefPtr<ContainerNode> parent = parentNode()) {
+        remove(es);
+        if (es.had_exception())
+            return;
+        parent->append(nodes, es);
+    }

[esprehn, 2015/02/14 01:50:08]

RefPtr<Node> parent = this->parent();
RefPtr<Node> next = m_next;
if (!parent)
  return;
remove();
parent->insertBefore(this, m_next);

should be the same as this function. replaceWith makes no sense if there's no
parent, you can't have siblings if there's no parent.

[esprehn, 2015/02/14 01:51:06]

Sorry that's parent->insertBefore(this, next);

[abarth-chromium, 2015/02/14 02:30:53]

We're trying to insert |nodes|, not |this|.  Also, |nodes| is a Vector, not a
single Node.  If I don't want to write a loop here, my choices are:

1) Call append or prepend on the parent.
2) Call insertBefore or insertAfter on a sibling.

The branch is necessary because |this| might be the only child of |parent| (in
which case I need to call append or prepend) or because |this| might be in the
middle of |parent| child list (which which case I need to call insertBefore or
insertAfter).

[esprehn, 2015/02/14 02:37:43]

Why not a loop then?

RefPtr<Node> parent = this->parent();
RefPtr<Node> next = m_next;
remove();
for (auto& node : nodes) {
  parent->insertBefore(node, next);
}

that replaces us with all those nodes right?

+}
+
 void Node::remove(ExceptionState& exceptionState)
 {
     if (ContainerNode* parent = parentNode())
         parent->removeChild(this, exceptionState);
 }
 
 const AtomicString& Node::localName() const
 {
     return nullAtom;
 }
@@ skipping 463 matching lines @@
 }
 
 // FIXME: End of obviously misplaced HTML editing functions.  Try to move these out of Node.
 
 Document* Node::ownerDocument() const
 {
     Document* doc = &document();
     return doc == this ? 0 : doc;
 }
 
-ContainerNode* Node::ownerScope() const
+ContainerNode* Node::owner() const
 {
     if (inDocument())
         return &treeScope().rootNode();
     if (ShadowRoot* root = containingShadowRoot())
         return root;
     return 0;
 }
 
 String Node::textContent() const
 {
@@ skipping 734 matching lines @@
         node->showTreeForThis();
 }
 
 void showNodePath(const blink::Node* node)
 {
     if (node)
         node->showNodePathForThis();
 }
 
 #endif