diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-07-31 09:43:40 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-07-31 09:43:40 -0600 |
| commit | c4480b5d0309acc7f154166b91992f73a85de57f (patch) | |
| tree | 494001ef3527c23854439ddca953a7443025712c /components/util/opts.rs | |
| parent | 33bc16fe353be237855d006b34e96fbe59f24846 (diff) | |
| parent | 17ead8716b53715086c990dc16e20e1cf6462c16 (diff) | |
| download | servo-c4480b5d0309acc7f154166b91992f73a85de57f.tar.gz servo-c4480b5d0309acc7f154166b91992f73a85de57f.zip | |
Auto merge of #6795 - pcwalton:display-list-e10s-fixes, r=glennw
Send display lists over IPC in multiprocess mode.
This patch set introduces the `--multiprocess` (`-M`) switch. Right now, all it does it cause display lists to be serialized, but eventually it will cause actual processes to be spawned.
r? @metajack
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6795)
<!-- Reviewable:end -->
Diffstat (limited to 'components/util/opts.rs')
| -rw-r--r-- | components/util/opts.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/components/util/opts.rs b/components/util/opts.rs index c8f65c97e54..efc580bd5e6 100644 --- a/components/util/opts.rs +++ b/components/util/opts.rs @@ -132,6 +132,9 @@ pub struct Opts { /// An optional string allowing the user agent to be set for testing. pub user_agent: Option<String>, + /// Whether to run in multiprocess mode. + pub multiprocess: bool, + /// Dumps the flow tree after a layout. pub dump_flow_tree: bool, @@ -251,6 +254,7 @@ pub fn default_opts() -> Opts { webdriver_port: None, initial_window_size: Size2D::typed(800, 600), user_agent: None, + multiprocess: false, dump_flow_tree: false, dump_display_list: false, dump_display_list_json: false, @@ -291,6 +295,7 @@ pub fn from_cmdline_args(args: &[String]) { getopts::optflagopt("", "webdriver", "Start remote WebDriver server on port", "7000"), getopts::optopt("", "resolution", "Set window resolution.", "800x600"), getopts::optopt("u", "user-agent", "Set custom user agent string", "NCSA Mosaic/1.0 (X11;SunOS 4.1.4 sun4m)"), + getopts::optflag("M", "multiprocess", "Run in multiprocess mode"), getopts::optopt("Z", "debug", "A comma-separated string of debug options. Pass help to show available options.", ""), getopts::optflag("h", "help", "Print this message"), @@ -421,6 +426,7 @@ pub fn from_cmdline_args(args: &[String]) { webdriver_port: webdriver_port, initial_window_size: initial_window_size, user_agent: opt_match.opt_str("u"), + multiprocess: opt_match.opt_present("M"), show_debug_borders: debug_options.contains(&"show-compositor-borders"), show_debug_fragment_borders: debug_options.contains(&"show-fragment-borders"), show_debug_parallel_paint: debug_options.contains(&"show-parallel-paint"), |