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

Fix several hangs / panics during pipeline cleanup of in progress loads.

Browse source 
This fixes a hang found while testing the jQuery test suite.
This commit is contained in:
Glenn Watson 2015-05-19 16:14:25 +10:00
parent 90aacf00f8
commit 35a570ab66
7 changed files with 46 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/compositing/compositor_task.rs
View file

@ -94,7 +94,13 @@ impl PaintListener for Box<CompositorProxy+'static+Send> {
fn get_graphics_metadata(&mut self) -> Option<NativeGraphicsMetadata> {
let (chan, port) = channel();
self.send(Msg::GetGraphicsMetadata(chan));
port.recv().unwrap()
// If the compositor is shutting down when a paint task
// is being created, the compositor won't respond to
// this message, resulting in an eventual panic. Instead,
// just return None in this case, since the paint task
// will exit shortly and never actually be requested
// to paint buffers by the compositor.
port.recv().unwrap_or(None)
}
fn assign_painted_buffers(&mut self,