DOM Range: surroundContents() should not check if newParent is in ancestors beforehand.

third_party/WebKit/Source/core/dom/Range.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Gunnstein Lye (gunnstein@netcom.no)
  * (C) 2000 Frederik Holljen (frederik.holljen@hig.no)
  * (C) 2001 Peter Kelly (pmk@post.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2011 Motorola Mobility. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1301 matching lines @@
 
   RangeBoundaryPoint startBoundaryPoint(refNode);
   startBoundaryPoint.setToStartOfNode(*refNode);
   start = startBoundaryPoint.toPosition();
   RangeBoundaryPoint endBoundaryPoint(refNode);
   endBoundaryPoint.setToEndOfNode(*refNode);
   end = endBoundaryPoint.toPosition();
   return true;
 }
 
+// https://dom.spec.whatwg.org/#dom-range-surroundcontents
 void Range::surroundContents(Node* newParent, ExceptionState& exceptionState) {
   if (!newParent) {
     // FIXME: Generated bindings code never calls with null, and neither should
     // other callers!
     exceptionState.throwTypeError("The node provided is null.");
     return;
   }
 
-  // InvalidStateError: Raised if the Range partially selects a non-Text node.
+  // 1. If a non-Text node is partially contained in the context object, then
+  // throw an InvalidStateError.
   Node* startNonTextContainer = m_start.container();
   if (startNonTextContainer->getNodeType() == Node::kTextNode)
     startNonTextContainer = startNonTextContainer->parentNode();
   Node* endNonTextContainer = m_end.container();
   if (endNonTextContainer->getNodeType() == Node::kTextNode)
     endNonTextContainer = endNonTextContainer->parentNode();
   if (startNonTextContainer != endNonTextContainer) {
     exceptionState.throwDOMException(
         InvalidStateError, "The Range has partially selected a non-Text node.");
     return;
   }
 
-  // InvalidNodeTypeError: Raised if node is an Attr, Entity, DocumentType,
-  // Notation,
-  // Document, or DocumentFragment node.
+  // 2. If newParent is a Document, DocumentType, or DocumentFragment node, then
+  // throw an InvalidNodeTypeError.
   switch (newParent->getNodeType()) {
     case Node::kAttributeNode:
     case Node::kDocumentFragmentNode:
     case Node::kDocumentNode:
     case Node::kDocumentTypeNode:
       exceptionState.throwDOMException(
           InvalidNodeTypeError,
           "The node provided is of type '" + newParent->nodeName() + "'.");
       return;
     case Node::kCdataSectionNode:
@@ skipping 24 matching lines @@
   }
 
   if (!parentOfNewParent->childTypeAllowed(newParent->getNodeType())) {
     exceptionState.throwDOMException(HierarchyRequestError,
                                      "The node provided is of type '" +
                                          newParent->nodeName() +
                                          "', which may not be inserted here.");
     return;
   }
 
-  if (newParent->isShadowIncludingInclusiveAncestorOf(m_start.container())) {
-    exceptionState.throwDOMException(HierarchyRequestError,
-                                     "The node provided contains the insertion "
-                                     "point; it may not be inserted into "
-                                     "itself.");
-    return;
-  }
-
-  // FIXME: Do we need a check if the node would end up with a child node of a

[tkent, 2017/03/09 22:36:33]

This FIXME comment was bogus. The check already exist.

-  // type not allowed by the type of node?
-
+  // 4. If newParent has children, replace all with null within newParent.
   while (Node* n = newParent->firstChild()) {
     toContainerNode(newParent)->removeChild(n, exceptionState);
     if (exceptionState.hadException())
       return;
   }
+
+  // 3. Let fragment be the result of extracting context object.
   DocumentFragment* fragment = extractContents(exceptionState);
   if (exceptionState.hadException())
     return;
+
+  // 5. If newParent has children, replace all with null within newParent.
   insertNode(newParent, exceptionState);
   if (exceptionState.hadException())
     return;
+
+  // 6. Append fragment to newParent.
   newParent->appendChild(fragment, exceptionState);
   if (exceptionState.hadException())
     return;
+
+  // 7. Select newParent within context object.
   selectNode(newParent, exceptionState);
 }
 
 void Range::setStartBefore(Node* refNode, ExceptionState& exceptionState) {
   checkNodeBA(refNode, exceptionState);
   if (exceptionState.hadException())
     return;
 
   setStart(refNode->parentNode(), refNode->nodeIndex(), exceptionState);
 }
@@ skipping 402 matching lines @@
                      .data()
               << "start offset: " << range->startOffset()
               << ", end offset: " << range->endOffset();
   } else {
     LOG(INFO) << "Cannot show tree if range is null, or if boundary points are "
                  "invalid.";
   }
 }
 
 #endif