diff options
| author | Ms2ger <ms2ger@gmail.com> | 2014-12-08 23:51:46 +0100 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2014-12-09 00:53:33 +0100 |
| commit | e76c3386ce226db45cd4d4d74828fa380034ec49 (patch) | |
| tree | fa176a8f40f355b564c3bff1083ab27fa333d39a /components/script/parse/html.rs | |
| parent | fbedf030d4a654fda6e7e14c8169fdc25cb3cd66 (diff) | |
| download | servo-e76c3386ce226db45cd4d4d74828fa380034ec49.tar.gz servo-e76c3386ce226db45cd4d4d74828fa380034ec49.zip | |
Move the load response into the HTMLInput enum.
It is None iff the parser input is an InputString variant, so it makes more
sense to pass it in the same enum.
Diffstat (limited to 'components/script/parse/html.rs')
| -rw-r--r-- | components/script/parse/html.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs index f78949d924c..040629bf672 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), + InputUrl(Url, LoadResponse), } trait SinkHelpers { @@ -163,8 +163,7 @@ impl<'a> TreeSink<TrustedNodeAddress> for servohtmlparser::Sink { pub fn parse_html(document: JSRef<Document>, input: HTMLInput, - base_url: Url, - load_response: Option<LoadResponse>) { + base_url: Url) { let parser = ServoHTMLParser::new(Some(base_url.clone()), document).root(); let parser: JSRef<ServoHTMLParser> = *parser; @@ -174,8 +173,7 @@ pub fn parse_html(document: JSRef<Document>, InputString(s) => { parser.parse_chunk(s); } - InputUrl(url) => { - let load_response = load_response.unwrap(); + InputUrl(url, 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()); |