make Opts.url an Option<> type, only emit initial url load if url exists

this is a necessary change for embedded apps to prevent an initial about:blank
page load from overwriting whatever the app was actually trying to load
This commit is contained in:
Mike Blumenkrantz 2015-05-26 21:18:32 -04:00
parent fcf449517d
commit b1ae5e7523
3 changed files with 11 additions and 7 deletions

View file

@ -24,7 +24,7 @@ use url::{self, Url};
#[derive(Clone)]
pub struct Opts {
/// The initial URL to load.
pub url: Url,
pub url: Option<Url>,
/// How many threads to use for CPU painting (`-t`).
///
@ -198,7 +198,7 @@ static FORCE_CPU_PAINTING: bool = false;
pub fn default_opts() -> Opts {
Opts {
url: Url::parse("about:blank").unwrap(),
url: Some(Url::parse("about:blank").unwrap()),
paint_threads: 1,
gpu_painting: false,
tile_size: 512,
@ -370,7 +370,7 @@ pub fn from_cmdline_args(args: &[String]) -> bool {
};
let opts = Opts {
url: url,
url: Some(url),
paint_threads: paint_threads,
gpu_painting: gpu_painting,
tile_size: tile_size,