aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/page.rs
diff options
context:
space:
mode:
authorCameron Zwarich <zwarich@mozilla.com>2014-09-18 13:43:15 -0700
committerCameron Zwarich <zwarich@mozilla.com>2014-09-19 13:39:17 -0700
commit4fa872511117eafd934cad70c7d3b8c583fb960e (patch)
tree8c75e871c896648de54c2e9aa376d30b4b98220e /components/script/page.rs
parentb8f34bbc5170f78e4939b1d647f8d8498e3c2fb6 (diff)
downloadservo-4fa872511117eafd934cad70c7d3b8c583fb960e.tar.gz
servo-4fa872511117eafd934cad70c7d3b8c583fb960e.zip
First steps of &JSRef -> JSRef conversion
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.
Diffstat (limited to 'components/script/page.rs')
-rw-r--r--components/script/page.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/components/script/page.rs b/components/script/page.rs
index 9bea4751c53..c4a2a217fec 100644
--- a/components/script/page.rs
+++ b/components/script/page.rs
@@ -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)