Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-08 08:33:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make parse_html's base_url argument non-optional.

Browse source 
It turns out the case where it woul be None can't happen.
This commit is contained in:
Ms2ger 2014-12-06 15:39:45 +01:00
parent c7c7dc03ee
commit 3e031bdaf8
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/parse/html.rs
View file

@ -163,9 +163,9 @@ impl<'a> TreeSink<TrustedNodeAddress> for servohtmlparser::Sink {
pub fn parse_html(document: JSRef<Document>, pub fn parse_html(document: JSRef<Document>,
input: HTMLInput, input: HTMLInput,
base_url: Option<Url>, base_url: Url,
load_response: Option<LoadResponse>) { 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; let parser: JSRef<ServoHTMLParser> = *parser;
task_state::enter(IN_HTML_PARSER); task_state::enter(IN_HTML_PARSER);
@ -178,7 +178,7 @@ pub fn parse_html(document: JSRef<Document>,
let load_response = load_response.unwrap(); let load_response = load_response.unwrap();
match load_response.metadata.content_type { match load_response.metadata.content_type {
Some((ref t, _)) if t.as_slice().eq_ignore_ascii_case("image") => { 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); parser.parse_chunk(page);
}, },
_ => { _ => {

9
components/script/script_task.rs
View file

@ -728,7 +728,7 @@ impl ScriptTask {
} else { } else {
url.clone() url.clone()
}; };
let document = Document::new(*window, Some(doc_url), HTMLDocument, let document = Document::new(*window, Some(doc_url.clone()), HTMLDocument,
None, FromParser).root(); None, FromParser).root();
window.init_browser_context(*document); window.init_browser_context(*document);
@ -783,13 +783,10 @@ impl ScriptTask {
*page.mut_url() = Some((base_url.clone(), true)); *page.mut_url() = Some((base_url.clone(), true));
} }
(Some(base_url), Some(load_response)) (base_url, Some(load_response))
}, },
InputString(_) => { InputString(_) => {
match *page.url() { (doc_url, None)
Some((ref page_url, _)) => (Some(page_url.clone()), None),
None => (None, None),
}
}, },
}; };