diff options
| author | Ms2ger <ms2ger@gmail.com> | 2014-12-06 15:39:45 +0100 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2014-12-08 12:44:49 +0100 |
| commit | 3e031bdaf8da146bbc0e2bca6db0edca75c20d0c (patch) | |
| tree | ee8bd4eba2c93099d8ee804b4ef6ced202d2e478 /components | |
| parent | c7c7dc03ee944ca03748f236dd08601eab5ceb24 (diff) | |
| download | servo-3e031bdaf8da146bbc0e2bca6db0edca75c20d0c.tar.gz servo-3e031bdaf8da146bbc0e2bca6db0edca75c20d0c.zip | |
Make parse_html's base_url argument non-optional.
It turns out the case where it woul be None can't happen.
Diffstat (limited to 'components')
| -rw-r--r-- | components/script/parse/html.rs | 6 | ||||
| -rw-r--r-- | components/script/script_task.rs | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs index 5f34c87d3da..f78949d924c 100644 --- a/components/script/parse/html.rs +++ b/components/script/parse/html.rs @@ -163,9 +163,9 @@ impl<'a> TreeSink<TrustedNodeAddress> for servohtmlparser::Sink { pub fn parse_html(document: JSRef<Document>, input: HTMLInput, - base_url: Option<Url>, + base_url: Url, load_response: Option<LoadResponse>) { - let parser = ServoHTMLParser::new(base_url.clone(), document).root(); + let parser = ServoHTMLParser::new(Some(base_url.clone()), document).root(); let parser: JSRef<ServoHTMLParser> = *parser; task_state::enter(IN_HTML_PARSER); @@ -178,7 +178,7 @@ pub fn parse_html(document: JSRef<Document>, let load_response = load_response.unwrap(); 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.as_ref().unwrap().serialize()); + let page = format!("<html><body><img src='{:s}' /></body></html>", base_url.serialize()); parser.parse_chunk(page); }, _ => { diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 688a89757c2..b36f7733a98 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -728,7 +728,7 @@ impl ScriptTask { } else { url.clone() }; - let document = Document::new(*window, Some(doc_url), HTMLDocument, + let document = Document::new(*window, Some(doc_url.clone()), HTMLDocument, None, FromParser).root(); window.init_browser_context(*document); @@ -783,13 +783,10 @@ impl ScriptTask { *page.mut_url() = Some((base_url.clone(), true)); } - (Some(base_url), Some(load_response)) + (base_url, Some(load_response)) }, InputString(_) => { - match *page.url() { - Some((ref page_url, _)) => (Some(page_url.clone()), None), - None => (None, None), - } + (doc_url, None) }, }; |