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

Fix gonk port

Browse source
This commit is contained in:
Brian Anderson 2015-05-09 22:04:12 -07:00
parent d1b0a4bd55
commit bc284691d2
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ports/gonk/Cargo.lock generated
View file

@ -1086,6 +1086,7 @@ dependencies = [
"string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
"string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
"time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]

11
ports/gonk/src/lib.rs
View file

@ -122,17 +122,8 @@ impl Browser {
devtools_chan, devtools_chan,
storage_task); storage_task);
// Send the URL command to the constellation.
let cwd = env::current_dir().unwrap();
let url = match url::Url::parse(&opts.url) {
Ok(url) => url,
Err(url::ParseError::RelativeUrlWithoutBase)
=> url::Url::from_file_path(&*cwd.join(&opts.url)).unwrap(),
Err(_) => panic!("URL parsing failed"),
};
let ConstellationChan(ref chan) = constellation_chan; let ConstellationChan(ref chan) = constellation_chan;
chan.send(ConstellationMsg::InitLoadUrl(url)).unwrap(); chan.send(ConstellationMsg::InitLoadUrl(opts.url.clone())).unwrap();
// The compositor coordinates with the client window to create the final // The compositor coordinates with the client window to create the final
// rendered page and display it somewhere. // rendered page and display it somewhere.