diff options
author | Keegan McAllister <kmcallister@mozilla.com> | 2014-09-18 16:29:46 -0700 |
---|---|---|
committer | Keegan McAllister <kmcallister@mozilla.com> | 2014-09-20 13:00:55 -0700 |
commit | dc86e8365495acc87b983a290bb7277a37a5247f (patch) | |
tree | 36af9677f6a24d7163e4b41c2b8e53da4d15538c /components/script/page.rs | |
parent | 2f46b9aedefae7938102f7a1ccc6c96044cf1bdb (diff) | |
download | servo-dc86e8365495acc87b983a290bb7277a37a5247f.tar.gz servo-dc86e8365495acc87b983a290bb7277a37a5247f.zip |
Eliminate warnings
Diffstat (limited to 'components/script/page.rs')
-rw-r--r-- | components/script/page.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/components/script/page.rs b/components/script/page.rs index c612ba6a791..a9469609576 100644 --- a/components/script/page.rs +++ b/components/script/page.rs @@ -169,7 +169,7 @@ impl Page { let damaged = self.damage.borrow().is_some(); if damaged { let frame = self.frame(); - let window = frame.get_ref().window.root(); + let window = frame.as_ref().unwrap().window.root(); self.reflow(goal, window.control_chan.clone(), &**window.compositor); } else { self.avoided_reflows.set(self.avoided_reflows.get() + 1); @@ -192,7 +192,7 @@ impl Page { self.children .deref() .borrow_mut() - .mut_iter() + .iter_mut() .enumerate() .find(|&(_idx, ref page_tree)| { // FIXME: page_tree has a lifetime such that it's unusable for anything. @@ -204,7 +204,7 @@ impl Page { match remove_idx { Some(idx) => return Some(self.children.deref().borrow_mut().remove(idx).unwrap()), None => { - for page_tree in self.children.deref().borrow_mut().mut_iter() { + for page_tree in self.children.deref().borrow_mut().iter_mut() { match page_tree.remove(id) { found @ Some(_) => return found, None => (), // keep going... @@ -292,7 +292,7 @@ impl Page { } pub fn get_url(&self) -> Url { - self.url().get_ref().ref0().clone() + self.url().as_ref().unwrap().ref0().clone() } // FIXME(cgaebel): join_layout is racey. What if the compositor triggers a @@ -393,7 +393,7 @@ impl Page { /// Attempt to find a named element in this page's document. pub fn find_fragment_node(&self, fragid: DOMString) -> Option<Temporary<Element>> { - let document = self.frame().get_ref().document.root(); + let document = self.frame().as_ref().unwrap().document.root(); match document.deref().GetElementById(fragid.to_string()) { Some(node) => Some(node), None => { @@ -412,7 +412,7 @@ impl Page { pub fn hit_test(&self, point: &Point2D<f32>) -> Option<UntrustedNodeAddress> { let frame = self.frame(); - let document = frame.get_ref().document.root(); + let document = frame.as_ref().unwrap().document.root(); let root = document.deref().GetDocumentElement().root(); if root.is_none() { return None; @@ -433,7 +433,7 @@ impl Page { pub fn get_nodes_under_mouse(&self, point: &Point2D<f32>) -> Option<Vec<UntrustedNodeAddress>> { let frame = self.frame(); - let document = frame.get_ref().document.root(); + let document = frame.as_ref().unwrap().document.root(); let root = document.deref().GetDocumentElement().root(); if root.is_none() { return None; |