Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove get_rooted() and replace all references to it with references to get()

Browse source
This commit is contained in:
rohan.prinja 2015-10-29 21:48:39 +09:00
parent 430578355b
commit 4a4f041948
11 changed files with 28 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/script/dom/node.rs
View file

@ -248,11 +248,11 @@ impl Node {
assert!(new_child.next_sibling.get().is_none());
match before {
Some(ref before) => {
assert!(before.parent_node.get_rooted().r() == Some(self));
assert!(before.parent_node.get().r() == Some(self));
let prev_sibling = before.GetPreviousSibling();
match prev_sibling {
None => {
assert!(Some(*before) == self.first_child.get_rooted().r());
assert!(Some(*before) == self.first_child.get().r());
self.first_child.set(Some(new_child));
},
Some(ref prev_sibling) => {
@ -293,7 +293,7 @@ impl Node {
///
/// Fails unless `child` is a child of this node.
fn remove_child(&self, child: &Node) {
assert!(child.parent_node.get_rooted().r() == Some(self));
assert!(child.parent_node.get().r() == Some(self));
let prev_sibling = child.GetPreviousSibling();
match prev_sibling {
None => {
@ -670,7 +670,7 @@ impl Node {
let doc = self.owner_doc();
let node = try!(doc.r().node_from_nodes_and_strings(nodes));
// Step 2.
let first_child = self.first_child.get_rooted();
let first_child = self.first_child.get();
Node::pre_insert(node.r(), self, first_child.r()).map(|_| ())
}
@ -1818,7 +1818,7 @@ impl NodeMethods for Node {
// https://dom.spec.whatwg.org/#dom-node-parentnode
fn GetParentNode(&self) -> Option<Root<Node>> {
self.parent_node.get_rooted()
self.parent_node.get()
}
// https://dom.spec.whatwg.org/#dom-node-parentelement
@ -1842,22 +1842,22 @@ impl NodeMethods for Node {
// https://dom.spec.whatwg.org/#dom-node-firstchild
fn GetFirstChild(&self) -> Option<Root<Node>> {
self.first_child.get_rooted()
self.first_child.get()
}
// https://dom.spec.whatwg.org/#dom-node-lastchild
fn GetLastChild(&self) -> Option<Root<Node>> {
self.last_child.get_rooted()
self.last_child.get()
}
// https://dom.spec.whatwg.org/#dom-node-previoussibling
fn GetPreviousSibling(&self) -> Option<Root<Node>> {
self.prev_sibling.get_rooted()
self.prev_sibling.get()
}
// https://dom.spec.whatwg.org/#dom-node-nextsibling
fn GetNextSibling(&self) -> Option<Root<Node>> {
self.next_sibling.get_rooted()
self.next_sibling.get()
}
// https://dom.spec.whatwg.org/#dom-node-nodevalue
@ -2360,7 +2360,7 @@ impl VirtualMethods for Node {
self.children_count.set(added.len() as u32);
},
}
if let Some(list) = self.child_list.get_rooted() {
if let Some(list) = self.child_list.get() {
list.as_children_list().children_changed(mutation);
}
}