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

auto merge of #3571 : Ms2ger/servo/rewrite-js-url, r=jdm

Browse source 
This should make it clearer that we always pass a URL to Document::new, and
avoids an unnecessary unwrap() call.
This commit is contained in:
bors-servo 2014-10-06 12:21:30 -06:00
commit 06489fcc42
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/script/script_task.rs
View file

@ -732,16 +732,16 @@ impl ScriptTask {
self.compositor.dup(),
self.image_cache_task.clone()).root();
let doc_url = if is_javascript {
let doc_url = match last_url {
Some(url) => Some(url.clone()),
None => Url::parse("about:blank").ok(),
};
*page.mut_url() = Some((doc_url.as_ref().unwrap().clone(), true));
let doc_url = last_url.unwrap_or_else(|| {
Url::parse("about:blank").unwrap()
});
*page.mut_url() = Some((doc_url.clone(), true));
doc_url
} else {
Some(url.clone())
url.clone()
};
let document = Document::new(*window, doc_url, HTMLDocument, None).root();
let document = Document::new(*window, Some(doc_url), HTMLDocument,
None).root();
window.deref().init_browser_context(*document);