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

Make IOCompositor only respond to the first Quit event.

Browse source 
This avoids huge mpsc_queue build-ups from the flood of Quit events
coming from glutin.

Fixes #5234.
This commit is contained in:
Nicholas Nethercote 2015-03-16 19:29:38 -07:00
parent 1092ca1019
commit 2b10f6e7ea
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/compositing/compositor.rs
View file

@ -128,6 +128,9 @@ pub struct IOCompositor<Window: WindowMethods> {
/// Pending scroll events. /// Pending scroll events.
pending_scroll_events: Vec<ScrollEvent>, pending_scroll_events: Vec<ScrollEvent>,
/// Has a Quit event been seen?
has_seen_quit_event: bool,
} }
pub struct ScrollEvent { pub struct ScrollEvent {
@ -217,6 +220,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
fragment_point: None, fragment_point: None,
outstanding_paint_msgs: 0, outstanding_paint_msgs: 0,
last_composite_time: 0, last_composite_time: 0,
has_seen_quit_event: false,
} }
} }
@ -787,10 +791,13 @@ impl<Window: WindowMethods> IOCompositor<Window> {
} }
WindowEvent::Quit => { WindowEvent::Quit => {
debug!("shutting down the constellation for WindowEvent::Quit"); if !self.has_seen_quit_event {
let ConstellationChan(ref chan) = self.constellation_chan; self.has_seen_quit_event = true;
chan.send(ConstellationMsg::Exit).unwrap(); debug!("shutting down the constellation for WindowEvent::Quit");
self.shutdown_state = ShutdownState::ShuttingDown; let ConstellationChan(ref chan) = self.constellation_chan;
chan.send(ConstellationMsg::Exit).unwrap();
self.shutdown_state = ShutdownState::ShuttingDown;
}
} }
} }
} }