Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

First steps of &JSRef -> JSRef conversion

Browse source 
Replace &JSRef with JSRef in the bulk of the generated code. This will
remove a level of indirection throughout all DOM code.

This patch doesn't change methods implemented on JSRef<T> to take `self`
rather than `&self`, and it leaves a few other uses of &JSRef, but those
changes can be made incrementally.
This commit is contained in:
Cameron Zwarich 2014-09-18 13:43:15 -07:00
parent b8f34bbc51
commit 4fa8725111
126 changed files with 994 additions and 992 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/script/page.rs
View file

@ -271,7 +271,7 @@ impl Page {
match root.root() {
None => {},
Some(root) => {
let root: &JSRef<Node> = NodeCast::from_ref(&*root);
let root: JSRef<Node> = NodeCast::from_ref(*root);
let mut damage = *self.damage.deref().borrow_mut();
match damage {
None => {}
@ -366,7 +366,7 @@ impl Page {
let last_reflow_id = self.last_reflow_id.deref();
last_reflow_id.set(last_reflow_id.get() + 1);
let root: &JSRef<Node> = NodeCast::from_ref(&*root);
let root: JSRef<Node> = NodeCast::from_ref(*root);
let mut damage = self.damage.deref().borrow_mut();
let window_size = self.window_size.deref().get();
@ -397,15 +397,15 @@ impl Page {
match document.deref().GetElementById(fragid.to_string()) {
Some(node) => Some(node),
None => {
let doc_node: &JSRef<Node> = NodeCast::from_ref(&*document);
let doc_node: JSRef<Node> = NodeCast::from_ref(*document);
let mut anchors = doc_node.traverse_preorder()
.filter(|node| node.is_anchor_element());
anchors.find(|node| {
let elem: &JSRef<Element> = ElementCast::to_ref(node).unwrap();
let elem: JSRef<Element> = ElementCast::to_ref(*node).unwrap();
elem.get_attribute(Null, "name").root().map_or(false, |attr| {
attr.deref().value().as_slice() == fragid.as_slice()
})
}).map(|node| Temporary::from_rooted(ElementCast::to_ref(&node).unwrap()))
}).map(|node| Temporary::from_rooted(ElementCast::to_ref(node).unwrap()))
}
}
}
@ -418,7 +418,7 @@ impl Page {
return None;
}
let root = root.unwrap();
let root: &JSRef<Node> = NodeCast::from_ref(&*root);
let root: JSRef<Node> = NodeCast::from_ref(*root);
let address = match self.layout().hit_test(root.to_trusted_node_address(), *point) {
Ok(HitTestResponse(node_address)) => {
Some(node_address)
@ -439,7 +439,7 @@ impl Page {
return None;
}
let root = root.unwrap();
let root: &JSRef<Node> = NodeCast::from_ref(&*root);
let root: JSRef<Node> = NodeCast::from_ref(*root);
let address = match self.layout().mouse_over(root.to_trusted_node_address(), *point) {
Ok(MouseOverResponse(node_address)) => {
Some(node_address)