diff options
| author | Ms2ger <ms2ger@gmail.com> | 2014-12-09 01:07:13 +0100 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2014-12-09 01:07:16 +0100 |
| commit | 0fc65d4088ada55e17045a08aac0f6d31489056a (patch) | |
| tree | a85218238dbec2dc4afecc56862fbf78b18ba2aa /components/script/parse/html.rs | |
| parent | e76c3386ce226db45cd4d4d74828fa380034ec49 (diff) | |
| download | servo-0fc65d4088ada55e17045a08aac0f6d31489056a.tar.gz servo-0fc65d4088ada55e17045a08aac0f6d31489056a.zip | |
Remove the url from the InputUrl variant.
This url is the pre-redirect url, which is not particularly meaningful, and it
is used only in a panic message.
Diffstat (limited to 'components/script/parse/html.rs')
| -rw-r--r-- | components/script/parse/html.rs | 10 |
1 files changed, 5 insertions, 5 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); }, _ => { |