corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

servo: Merge #8548 - Remove the unused arguments to hit_test and mouse_over (from Ms2ger:unused-tna); r=pcwalton

Browse Source 
I don't think this code is called when there is no document element, but I
added assertions to make sure we notice in case I was wrong.

Source-Repo: https://github.com/servo/servo
Source-Revision: 20d26853e145e275695463662b6cee334cd27085
This commit is contained in:
Ms2ger
2015-11-17 01:35:52 +05:00
parent 1be8cd53a2
commit 2bb9da787f
3 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
servo/components/script/dom/document.rs
View File

@@ -483,30 +483,19 @@ impl Document {
}
pub fn hit_test(&self, point: &Point2D<f32>) -> Option<UntrustedNodeAddress> {
let root = self.GetDocumentElement();
let root = match root.r() {
Some(root) => root,
None => return None,
};
let root = root.upcast::<Node>();
let address = match self.window.layout().hit_test(root.to_trusted_node_address(), *point) {
assert!(self.GetDocumentElement().is_some());
match self.window.layout().hit_test(*point) {
Ok(HitTestResponse(node_address)) => Some(node_address),
Err(()) => {
debug!("layout query error");
None
}
};
address
}
}
pub fn get_nodes_under_mouse(&self, point: &Point2D<f32>) -> Vec<UntrustedNodeAddress> {
let root = self.GetDocumentElement();
let root = match root.r() {
Some(root) => root,
None => return vec!(),
};
let root = root.upcast::<Node>();
match self.window.layout().mouse_over(root.to_trusted_node_address(), *point) {
assert!(self.GetDocumentElement().is_some());
match self.window.layout().mouse_over(*point) {
Ok(MouseOverResponse(node_address)) => node_address,
Err(()) => vec!(),
}