diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2015-10-14 18:15:44 -0700 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2015-10-15 14:03:57 -0700 |
| commit | 5bdf6bb1d3aad3bf758f99bec777eed8d41bc923 (patch) | |
| tree | 606b9c032055923c4b14fafda95f55ebfab7bd67 /components/script/dom/nodeiterator.rs | |
| parent | 57584e74c6fc192335ed3300ac75751bada0ff93 (diff) | |
| download | servo-5bdf6bb1d3aad3bf758f99bec777eed8d41bc923.tar.gz servo-5bdf6bb1d3aad3bf758f99bec777eed8d41bc923.zip | |
Fix remaining MutHeap methods not to expose JS<T>.
Diffstat (limited to 'components/script/dom/nodeiterator.rs')
| -rw-r--r-- | components/script/dom/nodeiterator.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/components/script/dom/nodeiterator.rs b/components/script/dom/nodeiterator.rs index 34ec3f6c658..c7152231776 100644 --- a/components/script/dom/nodeiterator.rs +++ b/components/script/dom/nodeiterator.rs @@ -36,7 +36,7 @@ impl NodeIterator { NodeIterator { reflector_: Reflector::new(), root_node: JS::from_ref(root_node), - reference_node: MutHeap::new(JS::from_ref(root_node)), + reference_node: MutHeap::new(root_node), pointer_before_reference_node: Cell::new(true), what_to_show: what_to_show, filter: filter @@ -87,7 +87,7 @@ impl NodeIteratorMethods for NodeIterator { // https://dom.spec.whatwg.org/#dom-nodeiterator-referencenode fn ReferenceNode(&self) -> Root<Node> { - self.reference_node.get().root() + self.reference_node.get() } // https://dom.spec.whatwg.org/#dom-nodeiterator-pointerbeforereferencenode @@ -99,7 +99,7 @@ impl NodeIteratorMethods for NodeIterator { fn NextNode(&self) -> Fallible<Option<Root<Node>>> { // https://dom.spec.whatwg.org/#concept-NodeIterator-traverse // Step 1. - let node = self.reference_node.get().root(); + let node = self.reference_node.get(); // Step 2. let mut before_node = self.pointer_before_reference_node.get(); @@ -114,7 +114,7 @@ impl NodeIteratorMethods for NodeIterator { // Step 3-3. if result == NodeFilterConstants::FILTER_ACCEPT { // Step 4. - self.reference_node.set(JS::from_ref(node.r())); + self.reference_node.set(node.r()); self.pointer_before_reference_node.set(before_node); return Ok(Some(node)); @@ -129,7 +129,7 @@ impl NodeIteratorMethods for NodeIterator { // Step 3-3. if result == NodeFilterConstants::FILTER_ACCEPT { // Step 4. - self.reference_node.set(JS::from_ref(following_node.r())); + self.reference_node.set(following_node.r()); self.pointer_before_reference_node.set(before_node); return Ok(Some(following_node)); @@ -143,7 +143,7 @@ impl NodeIteratorMethods for NodeIterator { fn PreviousNode(&self) -> Fallible<Option<Root<Node>>> { // https://dom.spec.whatwg.org/#concept-NodeIterator-traverse // Step 1. - let node = self.reference_node.get().root(); + let node = self.reference_node.get(); // Step 2. let mut before_node = self.pointer_before_reference_node.get(); @@ -158,7 +158,7 @@ impl NodeIteratorMethods for NodeIterator { // Step 3-3. if result == NodeFilterConstants::FILTER_ACCEPT { // Step 4. - self.reference_node.set(JS::from_ref(node.r())); + self.reference_node.set(node.r()); self.pointer_before_reference_node.set(before_node); return Ok(Some(node)); @@ -174,7 +174,7 @@ impl NodeIteratorMethods for NodeIterator { // Step 3-3. if result == NodeFilterConstants::FILTER_ACCEPT { // Step 4. - self.reference_node.set(JS::from_ref(preceding_node.r())); + self.reference_node.set(preceding_node.r()); self.pointer_before_reference_node.set(before_node); return Ok(Some(preceding_node)); |