Changeset 80696 in webkit

Timestamp:

Mar 10, 2011 12:33:11 AM (13 years ago)

Author:

ojan@chromium.org

Message:

2011-03-10 Ojan Vafai <​ojan@chromium.org>

Reviewed by Darin Adler.

Able to move nodes across documents
​https://bugs.webkit.org/show_bug.cgi?id=19524

Makes cross-document appendChild, insertBefore, Range.insertNode and Range.surroundContents work.
This matches Gecko and the new Dom Core spec. There are a number of Range methods where we don't
match Gecko or the spec that will need to be updated in a following patch.

• dom/html/level1/core/hc_elementwrongdocumenterr-expected.txt:
• dom/html/level1/core/hc_namednodemapwrongdocumenterr-expected.txt:
• dom/xhtml/level1/core/hc_elementwrongdocumenterr-expected.txt:
• dom/xhtml/level1/core/hc_namednodemapwrongdocumenterr-expected.txt:
• fast/dom/move-nodes-across-documents-expected.txt: Added.
• fast/dom/move-nodes-across-documents.html: Added.

2011-03-10 Ojan Vafai <​ojan@chromium.org>

Reviewed by Darin Adler.

Able to move nodes across documents
​https://bugs.webkit.org/show_bug.cgi?id=19524

Makes cross-document appendChild, insertBefore, Range.insertNode and Range.surroundContents work.
This matches Gecko and the new Dom Core spec. There are a number of Range methods where we don't
match Gecko or the spec that will need to be updated in a following patch.

Test: fast/dom/move-nodes-across-documents.html

• dom/Element.cpp: (WebCore::Element::removeAttributeNode):
• dom/NamedNodeMap.cpp: (WebCore::NamedNodeMap::setNamedItem):
• dom/Node.cpp: (WebCore::Node::setDocumentRecursively): (WebCore::checkAcceptChild): (WebCore::Node::checkReplaceChild):
• dom/Range.cpp: (WebCore::Range::insertNode): (WebCore::Range::surroundContents):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/dom/html/level1/core/hc_elementwrongdocumenterr-expected.txt (modified) (1 diff)
• LayoutTests/dom/html/level1/core/hc_namednodemapwrongdocumenterr-expected.txt (modified) (1 diff)
• LayoutTests/dom/xhtml/level1/core/hc_elementwrongdocumenterr-expected.txt (modified) (1 diff)
• LayoutTests/dom/xhtml/level1/core/hc_namednodemapwrongdocumenterr-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/move-nodes-across-documents-expected.txt (added)
• LayoutTests/fast/dom/move-nodes-across-documents.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (1 diff)
• Source/WebCore/dom/NamedNodeMap.cpp (modified) (1 diff)
• Source/WebCore/dom/Node.cpp (modified) (4 diffs)
• Source/WebCore/dom/Range.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-03-10  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Able to move nodes across documents
+        https://bugs.webkit.org/show_bug.cgi?id=19524
+
+        Makes cross-document appendChild, insertBefore, Range.insertNode and Range.surroundContents work.
+        This matches Gecko and the new Dom Core spec. There are a number of Range methods where we don't
+        match Gecko or the spec that will need to be updated in a following patch.
+
+        * dom/html/level1/core/hc_elementwrongdocumenterr-expected.txt:
+        * dom/html/level1/core/hc_namednodemapwrongdocumenterr-expected.txt:
+        * dom/xhtml/level1/core/hc_elementwrongdocumenterr-expected.txt:
+        * dom/xhtml/level1/core/hc_namednodemapwrongdocumenterr-expected.txt:
+        * fast/dom/move-nodes-across-documents-expected.txt: Added.
+        * fast/dom/move-nodes-across-documents.html: Added.
+
 2011-03-09  Roland Steiner  <rolandsteiner@chromium.org>
 

trunk/LayoutTests/dom/html/level1/core/hc_elementwrongdocumenterr-expected.txt

@@ -1 @@
-Test:   http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_elementwrongdocumenterr
-Status: Success
+Test:   http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_elementwrongdocumenterr    
+Status: failure
+Detail: throw_WRONG_DOCUMENT_ERR: assertTrue failed

trunk/LayoutTests/dom/html/level1/core/hc_namednodemapwrongdocumenterr-expected.txt

@@ -1 @@
-Test:   http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_namednodemapwrongdocumenterr
-Status: Success
+Test:   http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_namednodemapwrongdocumenterr       
+Status: failure
+Detail: throw_WRONG_DOCUMENT_ERR: assertTrue failed

trunk/LayoutTests/dom/xhtml/level1/core/hc_elementwrongdocumenterr-expected.txt

@@ -1 +1 @@
 Test    http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_elementwrongdocumenterr
-Status  Success
+Status  failure
+Message throw_WRONG_DOCUMENT_ERR: assertTrue failed

trunk/LayoutTests/dom/xhtml/level1/core/hc_namednodemapwrongdocumenterr-expected.txt

@@ -1 +1 @@
 Test    http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_namednodemapwrongdocumenterr
-Status  Success
+Status  failure
+Message throw_WRONG_DOCUMENT_ERR: assertTrue failed

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-10  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Able to move nodes across documents
+        https://bugs.webkit.org/show_bug.cgi?id=19524
+
+        Makes cross-document appendChild, insertBefore, Range.insertNode and Range.surroundContents work.
+        This matches Gecko and the new Dom Core spec. There are a number of Range methods where we don't 
+        match Gecko or the spec that will need to be updated in a following patch.
+
+        Test: fast/dom/move-nodes-across-documents.html
+
+        * dom/Element.cpp:
+        (WebCore::Element::removeAttributeNode):
+        * dom/NamedNodeMap.cpp:
+        (WebCore::NamedNodeMap::setNamedItem):
+        * dom/Node.cpp:
+        (WebCore::Node::setDocumentRecursively):
+        (WebCore::checkAcceptChild):
+        (WebCore::Node::checkReplaceChild):
+        * dom/Range.cpp:
+        (WebCore::Range::insertNode):
+        (WebCore::Range::surroundContents):
+
 2011-03-09  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1398 +1398 @@
         return 0;
     }
-    if (document() != attr->document()) {
-        ec = WRONG_DOCUMENT_ERR;
-        return 0;
-    }
+
+    ASSERT(document() == attr->document());
 
     NamedNodeMap* attrs = attributes(true);

trunk/Source/WebCore/dom/NamedNodeMap.cpp

@@ -101 +101 @@
     }
 
-    // WRONG_DOCUMENT_ERR: Raised if arg was created from a different document than the one that created this map.
-    if (arg->document() != m_element->document()) {
-        ec = WRONG_DOCUMENT_ERR;
-        return 0;
-    }
-
     // Not mentioned in spec: throw a HIERARCHY_REQUEST_ERROR if the user passes in a non-attribute node
     if (!arg->isAttributeNode()) {

trunk/Source/WebCore/dom/Node.cpp

@@ -760 +760 @@
 void Node::setDocumentRecursively(Document* document)
 {
-    // FIXME: To match Gecko, we should do this for nodes that are already in the document as well.
-    if (this->document() == document || this->inDocument())
+    if (this->document() == document)
         return;
 
@@ -1143 +1142 @@
 static void checkAcceptChild(Node* newParent, Node* newChild, ExceptionCode& ec)
 {
-    // Perform error checking as required by spec for adding a new child. Used by replaceChild().
-    
     // Not mentioned in spec: throw NOT_FOUND_ERR if newChild is null
     if (!newChild) {
@@ -1151 +1148 @@
     }
     
-    // NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly
     if (newParent->isReadOnlyNode()) {
         ec = NO_MODIFICATION_ALLOWED_ERR;
         return;
     }
-    
-    // WRONG_DOCUMENT_ERR: Raised if newChild was created from a different document than the one that
-    // created this node.
-    // We assume that if newChild is a DocumentFragment, all children are created from the same document
-    // as the fragment itself (otherwise they could not have been added as children)
-    if (newChild->document() != newParent->document() && newChild->inDocument()) {
-        // but if the child is not in a document yet then loosen the
-        // restriction, so that e.g. creating an element with the Option()
-        // constructor and then adding it to a different document works,
-        // as it does in Mozilla and Mac IE.
-        ec = WRONG_DOCUMENT_ERR;
-        return;
-    }
-    
+
+    if (newChild->inDocument() && newChild->nodeType() == Node::DOCUMENT_TYPE_NODE) {
+        ec = HIERARCHY_REQUEST_ERR;
+        return;
+    }
+
     // HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not allow children of the type of the
     // newChild node, or if the node to append is one of this node's ancestors.
 
-    // check for ancestor/same node
     if (newChild == newParent || newParent->isDescendantOf(newChild)) {
         ec = HIERARCHY_REQUEST_ERR;
@@ -1182 +1169 @@
 void Node::checkReplaceChild(Node* newChild, Node* oldChild, ExceptionCode& ec)
 {
+    if (!oldChild) {
+        ec = NOT_FOUND_ERR;
+        return;
+    }
+
     checkAcceptChild(this, newChild, ec);
     if (ec)

trunk/Source/WebCore/dom/Range.cpp

@@ -930 +930 @@
     if (containedByReadOnly()) {
         ec = NO_MODIFICATION_ALLOWED_ERR;
-        return;
-    }
-
-    // WRONG_DOCUMENT_ERR: Raised if newParent and the container of the start of the Range were
-    // not created from the same document.
-    if (newNode->document() != m_start.container()->document()) {
-        ec = WRONG_DOCUMENT_ERR;
         return;
     }
@@ -1424 +1417 @@
     }
 
-    // WRONG_DOCUMENT_ERR: Raised if newParent and the container of the start of the Range were
-    // not created from the same document.
-    if (newParent->document() != m_start.container()->document()) {
-        ec = WRONG_DOCUMENT_ERR;
-        return;
-    }
-
     // Raise a HIERARCHY_REQUEST_ERR if m_start.container() doesn't accept children like newParent.
     Node* parentOfNewParent = m_start.container();