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

Return Option for Window's layout channel

Browse source
This commit is contained in:
Antoine Martin 2020-07-03 03:33:59 +02:00
parent 4d60fd8ea9
commit 36fbbea2b5
5 changed files with 84 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/script/script_thread.rs
View file

@ -1172,9 +1172,13 @@ impl ScriptThread {
);
},
};
let _ = window
.layout_chan()
.send(Msg::RegisterPaint(name, properties, painter));
match window.layout_chan() {
Some(chan) => chan
.send(Msg::RegisterPaint(name, properties, painter))
.unwrap(),
None => warn!("Layout channel unavailable"),
}
}
pub fn push_new_element_queue() {
@ -2467,12 +2471,12 @@ impl ScriptThread {
});
// Pick a layout thread, any layout thread
let current_layout_chan = self
let current_layout_chan: Option<Sender<Msg>> = self
.documents
.borrow()
.iter()
.next()
.map(|(_, document)| document.window().layout_chan().clone())
.and_then(|(_, document)| document.window().layout_chan().cloned())
.or_else(|| {
self.incomplete_loads
.borrow()
@ -2879,7 +2883,10 @@ impl ScriptThread {
let load = self.incomplete_loads.borrow_mut().remove(idx);
load.layout_chan.clone()
} else if let Some(ref document) = document {
document.window().layout_chan().clone()
match document.window().layout_chan() {
Some(chan) => chan.clone(),
None => return warn!("Layout channel unavailable"),
}
} else {
return warn!("Exiting nonexistant pipeline {}.", id);
};