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

Inline Window::join_layout into its only caller.

Browse source 
I do not know if the FIXME comment is correct; I just copied it.
This commit is contained in:
Ms2ger 2015-10-22 15:57:46 +02:00
parent 9d739cf684
commit 7cd3870977
1 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

43
components/script/dom/window.rs
View file

@ -946,7 +946,24 @@ impl Window {
debug!("script: layout forked");
self.join_layout();
// FIXME(cgaebel): this is racey. What if the compositor triggers a
// reflow between the "join complete" message and returning from this
// function?
let mut layout_join_port = self.layout_join_port.borrow_mut();
if let Some(join_port) = std_mem::replace(&mut *layout_join_port, None) {
match join_port.try_recv() {
Err(Empty) => {
info!("script: waiting on layout");
join_port.recv().unwrap();
}
Ok(_) => {}
Err(Disconnected) => {
panic!("Layout task failed while script was waiting for a result.");
}
}
debug!("script: layout joined")
}
self.pending_reflow_count.set(0);
@ -977,30 +994,6 @@ impl Window {
self.force_reflow(goal, query_type, reason)
}
// FIXME(cgaebel): join_layout is racey. What if the compositor triggers a
// reflow between the "join complete" message and returning from this
// function?
/// Sends a ping to layout and waits for the response. The response will arrive when the
/// layout task has finished any pending request messages.
pub fn join_layout(&self) {
let mut layout_join_port = self.layout_join_port.borrow_mut();
if let Some(join_port) = std_mem::replace(&mut *layout_join_port, None) {
match join_port.try_recv() {
Err(Empty) => {
info!("script: waiting on layout");
join_port.recv().unwrap();
}
Ok(_) => {}
Err(Disconnected) => {
panic!("Layout task failed while script was waiting for a result.");
}
}
debug!("script: layout joined")
}
}
pub fn layout(&self) -> &LayoutRPC {
&*self.layout_rpc
}