mirror of
https://github.com/servo/servo.git
synced 2025-08-02 12:10:29 +01:00
Pass the load data to parse_html directly, rather than in an Option.
This commit is contained in:
parent
69e13f3267
commit
5d0934d8ec
2 changed files with 5 additions and 7 deletions
|
@ -212,17 +212,15 @@ pub fn parse_html(page: &Page,
|
|||
document: JSRef<Document>,
|
||||
input: HTMLInput,
|
||||
resource_task: ResourceTask,
|
||||
msg_load_data: Option<MsgLoadData>) {
|
||||
msg_load_data: MsgLoadData) {
|
||||
let (base_url, load_response) = match input {
|
||||
InputUrl(ref url) => {
|
||||
// Wait for the LoadResponse so that the parser knows the final URL.
|
||||
let (input_chan, input_port) = channel();
|
||||
let mut load_data = LoadData::new(url.clone(), input_chan);
|
||||
msg_load_data.map(|m| {
|
||||
load_data.headers = m.headers;
|
||||
load_data.method = m.method;
|
||||
load_data.data = m.data;
|
||||
});
|
||||
load_data.headers = msg_load_data.headers;
|
||||
load_data.method = msg_load_data.method;
|
||||
load_data.data = msg_load_data.data;
|
||||
resource_task.send(Load(load_data));
|
||||
|
||||
let load_response = input_port.recv();
|
||||
|
|
|
@ -748,7 +748,7 @@ impl ScriptTask {
|
|||
InputString(strval.unwrap_or("".to_string()))
|
||||
};
|
||||
|
||||
parse_html(&*page, *document, parser_input, self.resource_task.clone(), Some(load_data));
|
||||
parse_html(&*page, *document, parser_input, self.resource_task.clone(), load_data);
|
||||
url = page.get_url().clone();
|
||||
|
||||
document.set_ready_state(DocumentReadyStateValues::Interactive);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue