From 983e76af87cbc1553eae59b485ba1d9568a6da56 Mon Sep 17 00:00:00 2001 From: Jonathan Schuster Date: Wed, 3 Feb 2016 20:37:01 -0500 Subject: [PATCH 1/2] Update node::remove comments to reflect standard --- components/script/dom/node.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 5e02dc3d0e6..9340e716a5d 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -1551,12 +1551,16 @@ impl Node { Some(index) } }; - // Step 6. + // Step 6. pre-removing steps for node iterators + // Step 7. let old_previous_sibling = node.GetPreviousSibling(); - // Steps 7-8: mutation observers. - // Step 9. + // Step 8. let old_next_sibling = node.GetNextSibling(); + // Step 9. parent.remove_child(node, cached_index); + // Step 10. removing steps (https://dom.spec.whatwg.org/#concept-node-remove-ext) + // Step 11. transient registered observers + // Step 12. if let SuppressObserver::Unsuppressed = suppress_observers { vtable_for(&parent).children_changed( &ChildrenMutation::replace(old_previous_sibling.r(), From 4bb5cd1285ebceb9d2baca432995ab8f09648ba3 Mon Sep 17 00:00:00 2001 From: Jonathan Schuster Date: Sat, 13 Feb 2016 14:22:10 -0500 Subject: [PATCH 2/2] Move comment about removing steps --- components/script/dom/node.rs | 3 +-- components/script/dom/virtualmethods.rs | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 9340e716a5d..5f44a0df67c 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -1556,9 +1556,8 @@ impl Node { let old_previous_sibling = node.GetPreviousSibling(); // Step 8. let old_next_sibling = node.GetNextSibling(); - // Step 9. + // Steps 9-10 are handled in unbind_from_tree. parent.remove_child(node, cached_index); - // Step 10. removing steps (https://dom.spec.whatwg.org/#concept-node-remove-ext) // Step 11. transient registered observers // Step 12. if let SuppressObserver::Unsuppressed = suppress_observers { diff --git a/components/script/dom/virtualmethods.rs b/components/script/dom/virtualmethods.rs index 2e8391671a8..e3def582ae4 100644 --- a/components/script/dom/virtualmethods.rs +++ b/components/script/dom/virtualmethods.rs @@ -83,6 +83,8 @@ pub trait VirtualMethods { /// Called when a Node is removed from a tree, where 'tree_in_doc' /// indicates whether the tree is part of a Document. + /// Implements removing steps: + /// https://dom.spec.whatwg.org/#concept-node-remove-ext fn unbind_from_tree(&self, context: &UnbindContext) { if let Some(ref s) = self.super_type() { s.unbind_from_tree(context);