Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 05:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup join_layout a little bit.

Browse source
This commit is contained in:
Ms2ger 2015-02-12 22:42:06 +01:00
parent b351b216c6
commit 79914e560f
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/script/page.rs
View file

@ -327,25 +327,23 @@ impl Page {
/// layout task has finished any pending request messages. /// layout task has finished any pending request messages.
fn join_layout(&self) { fn join_layout(&self) {
let mut layout_join_port = self.layout_join_port.borrow_mut(); let mut layout_join_port = self.layout_join_port.borrow_mut();
if layout_join_port.is_some() { let join_port = replace(&mut *layout_join_port, None);
let join_port = replace(&mut *layout_join_port, None); match join_port {
match join_port { Some(ref join_port) => {
Some(ref join_port) => { match join_port.try_recv() {
match join_port.try_recv() { Err(Empty) => {
Err(Empty) => { info!("script: waiting on layout");
info!("script: waiting on layout"); join_port.recv().unwrap();
join_port.recv().unwrap(); }
} Ok(_) => {}
Ok(_) => {} Err(Disconnected) => {
Err(Disconnected) => { panic!("Layout task failed while script was waiting for a result.");
panic!("Layout task failed while script was waiting for a result.");
}
} }
debug!("script: layout joined")
} }
None => panic!("reader forked but no join port?"),
debug!("script: layout joined")
} }
None => (),
} }
} }