Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-13 02:44:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use an option for the parser input.

Browse source
This commit is contained in:
Josh Matthews 2015-02-04 17:56:31 +00:00
parent 03ec5a394c
commit a814ba4449
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/script_task.rs
View file

@ -810,12 +810,12 @@ impl ScriptTask {
let final_url = load_response.metadata.final_url.clone();
(HTMLInput::InputUrl(load_response), final_url, last_modified)
(Some(HTMLInput::InputUrl(load_response)), final_url, last_modified)
} else {
let doc_url = last_url.unwrap_or_else(|| {
Url::parse("about:blank").unwrap()
});
(HTMLInput::InputString("".to_owned()), doc_url, None)
(None, doc_url, None)
};
// Store the final URL before we start parsing, so that DOM routines
@ -858,10 +858,10 @@ impl ScriptTask {
let jsval = window.r().evaluate_js_on_global_with_result(evalstr);
let strval = FromJSValConvertible::from_jsval(self.get_cx(), jsval,
StringificationBehavior::Empty);
parser_input = HTMLInput::InputString(strval.unwrap_or("".to_owned()));
parser_input = Some(HTMLInput::InputString(strval.unwrap_or("".to_owned())));
};
parse_html(document.r(), parser_input, &final_url);
parse_html(document.r(), parser_input.unwrap(), &final_url);
document.r().set_ready_state(DocumentReadyState::Interactive);
self.compositor.borrow_mut().set_ready_state(pipeline_id, PerformingLayout);