diff options
author | Peter <ptrgonda@gmail.com> | 2015-05-06 16:37:52 -0400 |
---|---|---|
committer | Peter <ptrgonda@gmail.com> | 2015-05-26 10:01:03 -0400 |
commit | 7239d67353e8fed9f1845dc24c32b6081eeeef39 (patch) | |
tree | 0f5e442f98e271694a837681ff591f1dbf71959a | |
parent | 387836c42e2377fc53d51d3404e6b91d170727a8 (diff) | |
download | servo-7239d67353e8fed9f1845dc24c32b6081eeeef39.tar.gz servo-7239d67353e8fed9f1845dc24c32b6081eeeef39.zip |
fixes #5963
-rw-r--r-- | components/script/dom/node.rs | 10 | ||||
m--------- | support/android-rs-glue | 0 | ||||
-rw-r--r-- | tests/wpt/web-platform-tests/dom/nodes/Document-getElementById.html | 22 |
3 files changed, 25 insertions, 7 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 048ee28b3a9..ee1451a0137 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -304,6 +304,7 @@ impl<'a> PrivateNodeHelpers for JSRef<'a, Node> { assert!(self.parent_node.get().is_none()); for node in self.traverse_preorder() { let node = node.root(); + node.r().set_flag(IS_IN_DOC, false); vtable_for(&node.r()).unbind_from_tree(parent_in_doc); } self.layout_data.dispose(); @@ -1658,7 +1659,7 @@ impl Node { } // https://dom.spec.whatwg.org/#concept-node-remove - fn remove(node: JSRef<Node>, parent: JSRef<Node>, suppress_observers: SuppressObserver) { + fn remove(node: JSRef<Node>, parent: JSRef<Node>, _suppress_observers: SuppressObserver) { assert!(node.GetParentNode().map_or(false, |node_parent| node_parent == Temporary::from_rooted(parent))); // Step 1-5: ranges. @@ -1666,13 +1667,8 @@ impl Node { // Step 8. parent.remove_child(node); - node.set_flag(IS_IN_DOC, false); - // Step 9. - match suppress_observers { - SuppressObserver::Suppressed => (), - SuppressObserver::Unsuppressed => node.node_removed(parent.is_in_doc()), - } + node.node_removed(parent.is_in_doc()); } // https://dom.spec.whatwg.org/#concept-node-clone diff --git a/support/android-rs-glue b/support/android-rs-glue -Subproject 10116eb3af332f9565e0fb803e600511bb585d6 +Subproject dc8aef3e1b8f1acd141986cfab492e3f57d2d5f diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-getElementById.html b/tests/wpt/web-platform-tests/dom/nodes/Document-getElementById.html index 66ca0e7c81b..3a67dcd423e 100644 --- a/tests/wpt/web-platform-tests/dom/nodes/Document-getElementById.html +++ b/tests/wpt/web-platform-tests/dom/nodes/Document-getElementById.html @@ -20,6 +20,13 @@ <input id="test5" type="submit" value="Submit" data-name="3rd"> </div> + <!-- test 15 --> + <div id="outer"> + <div id="middle"> + <div id="inner"></div> + </div> + </div> + <script> var gBody = document.getElementsByTagName("body")[0]; @@ -300,6 +307,21 @@ assert_equals(document.getElementById(TEST_ID), b); }, "Inserting an id by inserting its parent node"); + test(function () { + var TEST_ID = "test15" + var outer = document.getElementById("outer"); + var middle = document.getElementById("middle"); + var inner = document.getElementById("inner"); + outer.removeChild(middle); + + var new_el = document.createElement("h1"); + new_el.id = "heading"; + inner.appendChild(new_el); + // the new element is not part of the document since + // "middle" element was removed previously + assert_equals(document.getElementById("heading"), null); + }, "Document.getElementById must not return nodes not present in document"); + // TODO: // id attribute in a namespace |