diff options
| -rw-r--r-- | components/script/parse/html.rs | 10 | ||||
| -rw-r--r-- | components/script/script_task.rs | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs index 040629bf672..c629305e931 100644 --- a/components/script/parse/html.rs +++ b/components/script/parse/html.rs @@ -33,7 +33,7 @@ use string_cache::QualName; pub enum HTMLInput { InputString(String), - InputUrl(Url, LoadResponse), + InputUrl(LoadResponse), } trait SinkHelpers { @@ -163,8 +163,8 @@ impl<'a> TreeSink<TrustedNodeAddress> for servohtmlparser::Sink { pub fn parse_html(document: JSRef<Document>, input: HTMLInput, - base_url: Url) { - let parser = ServoHTMLParser::new(Some(base_url.clone()), document).root(); + url: Url) { + let parser = ServoHTMLParser::new(Some(url.clone()), document).root(); let parser: JSRef<ServoHTMLParser> = *parser; task_state::enter(IN_HTML_PARSER); @@ -173,10 +173,10 @@ pub fn parse_html(document: JSRef<Document>, InputString(s) => { parser.parse_chunk(s); } - InputUrl(url, load_response) => { + InputUrl(load_response) => { match load_response.metadata.content_type { Some((ref t, _)) if t.as_slice().eq_ignore_ascii_case("image") => { - let page = format!("<html><body><img src='{:s}' /></body></html>", base_url.serialize()); + let page = format!("<html><body><img src='{:s}' /></body></html>", url.serialize()); parser.parse_chunk(page); }, _ => { diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 02c30e52a42..01473c34681 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -748,7 +748,7 @@ impl ScriptTask { // 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(), + url: url, method: load_data.method, headers: load_data.headers, data: load_data.data, @@ -773,7 +773,7 @@ impl ScriptTask { *page.mut_url() = Some((base_url.clone(), true)); } - (InputUrl(url.clone(), load_response), base_url) + (InputUrl(load_response), base_url) } else { let evalstr = load_data.url.non_relative_scheme_data().unwrap(); let jsval = window.evaluate_js_with_result(evalstr); |