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

Remove unused exit after load option.

Browse source 
This simplifies some upcoming changes to how event handling works.
This commit is contained in:
Glenn Watson 2014-11-21 09:14:59 +10:00
parent 133b523d2b
commit 898c1ecc8f
7 changed files with 6 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/compositing/compositor.rs
View file

@ -14,7 +14,7 @@ use constellation::{SendableFrameTree, FrameTreeDiff};
use pipeline::CompositionPipeline;
use scrolling::ScrollingTimerProxy;
use windowing;
use windowing::{FinishedWindowEvent, IdleWindowEvent, LoadUrlWindowEvent, MouseWindowClickEvent};
use windowing::{IdleWindowEvent, LoadUrlWindowEvent, MouseWindowClickEvent};
use windowing::{MouseWindowEvent, MouseWindowEventClass, MouseWindowMouseDownEvent};
use windowing::{MouseWindowMouseUpEvent, MouseWindowMoveEventClass, NavigationWindowEvent};
use windowing::{QuitWindowEvent, RefreshWindowEvent, ResizeWindowEvent, ScrollWindowEvent};
@ -668,16 +668,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.on_key_event(key, state, modifiers);
}
FinishedWindowEvent => {
let exit = opts::get().exit_after_load;
if exit {
debug!("shutting down the constellation for FinishedWindowEvent");
let ConstellationChan(ref chan) = self.constellation_chan;
chan.send(ExitMsg);
self.shutdown_state = ShuttingDown;
}
}
QuitWindowEvent => {
debug!("shutting down the constellation for QuitWindowEvent");
let ConstellationChan(ref chan) = self.constellation_chan;
@ -1053,13 +1043,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.last_composite_time = precise_time_ns();
let exit = opts::get().exit_after_load;
if exit {
debug!("shutting down the constellation for exit_after_load");
let ConstellationChan(ref chan) = self.constellation_chan;
chan.send(ExitMsg);
}
self.composition_request = NoCompositingNecessary;
self.process_pending_scroll_events();
}

3
components/compositing/windowing.rs
View file

@ -55,8 +55,6 @@ pub enum WindowEvent {
PinchZoomWindowEvent(f32),
/// Sent when the user uses chrome navigation (i.e. backspace or shift-backspace).
NavigationWindowEvent(WindowNavigateMsg),
/// Sent when rendering is finished.
FinishedWindowEvent,
/// Sent when the user quits the application
QuitWindowEvent,
/// Sent when a key input state changes
@ -77,7 +75,6 @@ impl Show for WindowEvent {
ZoomWindowEvent(..) => write!(f, "Zoom"),
PinchZoomWindowEvent(..) => write!(f, "PinchZoom"),
NavigationWindowEvent(..) => write!(f, "Navigation"),
FinishedWindowEvent => write!(f, "Finished"),
QuitWindowEvent => write!(f, "Quit"),
}
}

5
components/util/opts.rs
View file

@ -64,9 +64,6 @@ pub struct Opts {
pub nonincremental_layout: bool,
/// True to exit after the page load (`-x`).
pub exit_after_load: bool,
pub output_file: Option<String>,
pub headless: bool,
pub hard_fail: bool,
@ -168,7 +165,6 @@ fn default_opts() -> Opts {
enable_experimental: false,
layout_threads: 1,
nonincremental_layout: false,
exit_after_load: false,
output_file: None,
headless: true,
hard_fail: true,
@ -321,7 +317,6 @@ pub fn from_cmdline_args(args: &[String]) -> bool {
enable_experimental: opt_match.opt_present("e"),
layout_threads: layout_threads,
nonincremental_layout: nonincremental_layout,
exit_after_load: opt_match.opt_present("x"),
output_file: opt_match.opt_str("o"),
headless: opt_match.opt_present("z"),
hard_fail: opt_match.opt_present("f"),