Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-30 10:40:27 +01:00
Code Issues Projects Releases Packages Wiki Activity

Do not unwrap in element{,s}FromPoint

Browse source
This commit is contained in:
Keith Yeung 2018-05-07 23:25:09 -07:00
parent acd4e215ab
commit df23f909cd
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/document.rs
View file

@ -3624,7 +3624,7 @@ impl DocumentMethods for Document {
let y = *y as f32;
let point = &Point2D::new(x, y);
let window = window_from_node(self);
let viewport = window.window_size().unwrap().initial_viewport;
let viewport = window.window_size()?.initial_viewport;
if self.browsing_context().is_none() {
return None;
@ -3658,7 +3658,10 @@ impl DocumentMethods for Document {
let y = *y as f32;
let point = &Point2D::new(x, y);
let window = window_from_node(self);
let viewport = window.window_size().unwrap().initial_viewport;
let viewport = match window.window_size() {
Some(size) => size.initial_viewport,
None => return vec![]
};
if self.browsing_context().is_none() {
return vec!();