aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/nodeiterator.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2017-09-26 01:53:40 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2017-09-26 09:49:10 +0200
commitf87c2a8d7616112ca924e30292db2d244cf87eec (patch)
tree7344afe7ec0ec1ac7d1d13f5385111ee9c4be332 /components/script/dom/nodeiterator.rs
parent577370746e2ce3da7fa25a20b8e1bbeed319df65 (diff)
downloadservo-f87c2a8d7616112ca924e30292db2d244cf87eec.tar.gz
servo-f87c2a8d7616112ca924e30292db2d244cf87eec.zip
Rename Root<T> to DomRoot<T>
In a later PR, DomRoot<T> will become a type alias of Root<Dom<T>>, where Root<T> will be able to handle all the things that need to be rooted that have a stable traceable address that doesn't move for the whole lifetime of the root. Stay tuned.
Diffstat (limited to 'components/script/dom/nodeiterator.rs')
-rw-r--r--components/script/dom/nodeiterator.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/components/script/dom/nodeiterator.rs b/components/script/dom/nodeiterator.rs
index ec18066a978..3ee09742e67 100644
--- a/components/script/dom/nodeiterator.rs
+++ b/components/script/dom/nodeiterator.rs
@@ -10,7 +10,7 @@ use dom::bindings::codegen::Bindings::NodeIteratorBinding;
use dom::bindings::codegen::Bindings::NodeIteratorBinding::NodeIteratorMethods;
use dom::bindings::error::Fallible;
use dom::bindings::reflector::{Reflector, reflect_dom_object};
-use dom::bindings::root::{Dom, MutDom, Root};
+use dom::bindings::root::{Dom, DomRoot, MutDom};
use dom::document::Document;
use dom::node::Node;
use dom_struct::dom_struct;
@@ -46,7 +46,7 @@ impl NodeIterator {
pub fn new_with_filter(document: &Document,
root_node: &Node,
what_to_show: u32,
- filter: Filter) -> Root<NodeIterator> {
+ filter: Filter) -> DomRoot<NodeIterator> {
reflect_dom_object(box NodeIterator::new_inherited(root_node, what_to_show, filter),
document.window(),
NodeIteratorBinding::Wrap)
@@ -55,7 +55,7 @@ impl NodeIterator {
pub fn new(document: &Document,
root_node: &Node,
what_to_show: u32,
- node_filter: Option<Rc<NodeFilter>>) -> Root<NodeIterator> {
+ node_filter: Option<Rc<NodeFilter>>) -> DomRoot<NodeIterator> {
let filter = match node_filter {
None => Filter::None,
Some(jsfilter) => Filter::Callback(jsfilter)
@@ -66,8 +66,8 @@ impl NodeIterator {
impl NodeIteratorMethods for NodeIterator {
// https://dom.spec.whatwg.org/#dom-nodeiterator-root
- fn Root(&self) -> Root<Node> {
- Root::from_ref(&*self.root_node)
+ fn Root(&self) -> DomRoot<Node> {
+ DomRoot::from_ref(&*self.root_node)
}
// https://dom.spec.whatwg.org/#dom-nodeiterator-whattoshow
@@ -84,7 +84,7 @@ impl NodeIteratorMethods for NodeIterator {
}
// https://dom.spec.whatwg.org/#dom-nodeiterator-referencenode
- fn ReferenceNode(&self) -> Root<Node> {
+ fn ReferenceNode(&self) -> DomRoot<Node> {
self.reference_node.get()
}
@@ -94,7 +94,7 @@ impl NodeIteratorMethods for NodeIterator {
}
// https://dom.spec.whatwg.org/#dom-nodeiterator-nextnode
- fn NextNode(&self) -> Fallible<Option<Root<Node>>> {
+ fn NextNode(&self) -> Fallible<Option<DomRoot<Node>>> {
// https://dom.spec.whatwg.org/#concept-NodeIterator-traverse
// Step 1.
let node = self.reference_node.get();
@@ -138,7 +138,7 @@ impl NodeIteratorMethods for NodeIterator {
}
// https://dom.spec.whatwg.org/#dom-nodeiterator-previousnode
- fn PreviousNode(&self) -> Fallible<Option<Root<Node>>> {
+ fn PreviousNode(&self) -> Fallible<Option<DomRoot<Node>>> {
// https://dom.spec.whatwg.org/#concept-NodeIterator-traverse
// Step 1.
let node = self.reference_node.get();