Auto merge of #6666 - glennw:exit-flag, r=larsbergstrom

Restore exit after load command line flag.

Also updates glutin with a crash fix that was exposed by this patch.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6666)
<!-- Reviewable:end -->

1 files changed, 5 insertions, 0 deletions

diff --git a/components/util/opts.rs b/components/util/opts.rs
index 550dd2a408e..2ec9bb43794 100644
--- a/components/util/opts.rs
+++ b/components/util/opts.rs
@@ -163,6 +163,9 @@ pub struct Opts {
 
     /// Whether to run absolute position calculation and display list construction in parallel.
     pub parallel_display_list_building: bool,
+
+    /// True to exit after the page load (`-x`).
+    pub exit_after_load: bool,
 }
 
 fn print_usage(app: &str, opts: &[getopts::OptGroup]) {
@@ -261,6 +264,7 @@ pub fn default_opts() -> Opts {
         sniff_mime_types: false,
         disable_share_style_cache: false,
         parallel_display_list_building: false,
+        exit_after_load: false,
     }
 }
 
@@ -437,6 +441,7 @@ pub fn from_cmdline_args(args: &[String]) {
         sniff_mime_types: opt_match.opt_present("sniff-mime-types"),
         disable_share_style_cache: debug_options.contains(&"disable-share-style-cache"),
         parallel_display_list_building: debug_options.contains(&"parallel-display-list-building"),
+        exit_after_load: opt_match.opt_present("x"),
     };
 
     set(opts);