Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-25 00:00:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Combine two conditionals in ScriptTask::load.

Browse source 
Now that the code lives in the same function, I see no reason for them to
remain separate.
This commit is contained in:
Ms2ger 2014-12-08 19:21:41 +01:00
parent 9f08d563ae
commit fbedf030d4
1 changed files with 31 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

71
components/script/script_task.rs
View file

@ -744,50 +744,41 @@ impl ScriptTask {
}); });
} }
let parser_input = if !is_javascript { let (parser_input, base_url, load_response) = if !is_javascript {
InputUrl(url.clone()) // Wait for the LoadResponse so that the parser knows the final URL.
let (input_chan, input_port) = channel();
self.resource_task.send(Load(NetLoadData {
url: url.clone(),
method: load_data.method,
headers: load_data.headers,
data: load_data.data,
cors: None,
consumer: input_chan,
}));
let load_response = input_port.recv();
load_response.metadata.headers.as_ref().map(|headers| {
headers.get().map(|&LastModified(ref tm)| {
document.set_last_modified(dom_last_modified(tm));
});
});
let base_url = load_response.metadata.final_url.clone();
{
// Store the final URL before we start parsing, so that DOM routines
// (e.g. HTMLImageElement::update_image) can resolve relative URLs
// correctly.
*page.mut_url() = Some((base_url.clone(), true));
}
(InputUrl(url.clone()), base_url, Some(load_response))
} else { } else {
let evalstr = load_data.url.non_relative_scheme_data().unwrap(); let evalstr = load_data.url.non_relative_scheme_data().unwrap();
let jsval = window.evaluate_js_with_result(evalstr); let jsval = window.evaluate_js_with_result(evalstr);
let strval = FromJSValConvertible::from_jsval(self.get_cx(), jsval, Empty); let strval = FromJSValConvertible::from_jsval(self.get_cx(), jsval, Empty);
InputString(strval.unwrap_or("".to_string())) (InputString(strval.unwrap_or("".to_string())), doc_url, None)
};
let (base_url, load_response) = match parser_input {
InputUrl(ref url) => {
// Wait for the LoadResponse so that the parser knows the final URL.
let (input_chan, input_port) = channel();
self.resource_task.send(Load(NetLoadData {
url: url.clone(),
method: load_data.method,
headers: load_data.headers,
data: load_data.data,
cors: None,
consumer: input_chan,
}));
let load_response = input_port.recv();
load_response.metadata.headers.as_ref().map(|headers| {
headers.get().map(|&LastModified(ref tm)| {
document.set_last_modified(dom_last_modified(tm));
});
});
let base_url = load_response.metadata.final_url.clone();
{
// Store the final URL before we start parsing, so that DOM routines
// (e.g. HTMLImageElement::update_image) can resolve relative URLs
// correctly.
*page.mut_url() = Some((base_url.clone(), true));
}
(base_url, Some(load_response))
},
InputString(_) => {
(doc_url, None)
},
}; };
parse_html(*document, parser_input, base_url, load_response); parse_html(*document, parser_input, base_url, load_response);