Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Issue 8028: parse_html should take Url rather than &Url

Browse source
This commit is contained in:
Stephen Li 2015-10-15 13:48:29 -04:00
parent 5a0a91eba7
commit e83d5a9669
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/domparser.rs
View file

@ -63,7 +63,7 @@ impl DOMParserMethods for DOMParser {
None, None,
DocumentSource::FromParser, DocumentSource::FromParser,
loader); loader);
parse_html(document.r(), s, &url, ParseContext::Owner(None)); parse_html(document.r(), s, url, ParseContext::Owner(None));
document.r().set_ready_state(DocumentReadyState::Complete); document.r().set_ready_state(DocumentReadyState::Complete);
Ok(document) Ok(document)
} }

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

@ -262,13 +262,13 @@ pub enum ParseContext<'a> {
pub fn parse_html(document: &Document, pub fn parse_html(document: &Document,
input: String, input: String,
url: &Url, url: Url,
context: ParseContext) { context: ParseContext) {
let parser = match context { let parser = match context {
ParseContext::Owner(owner) => ParseContext::Owner(owner) =>
ServoHTMLParser::new(Some(url.clone()), document, owner), ServoHTMLParser::new(Some(url), document, owner),
ParseContext::Fragment(fc) => ParseContext::Fragment(fc) =>
ServoHTMLParser::new_for_fragment(Some(url.clone()), document, fc), ServoHTMLParser::new_for_fragment(Some(url), document, fc),
}; };
parser.r().parse_chunk(input.into()); parser.r().parse_chunk(input.into());
} }
@ -300,7 +300,7 @@ pub fn parse_html_fragment(context_node: &Node,
context_elem: context_node, context_elem: context_node,
form_elem: form.r(), form_elem: form.r(),
}; };
parse_html(document.r(), input, &url, ParseContext::Fragment(fragment_context)); parse_html(document.r(), input, url.clone(), ParseContext::Fragment(fragment_context));
// Step 14. // Step 14.
let root_element = document.r().GetDocumentElement().expect("no document element"); let root_element = document.r().GetDocumentElement().expect("no document element");

2
components/script/script_task.rs
View file

@ -1648,7 +1648,7 @@ impl ScriptTask {
"".to_owned() "".to_owned()
}; };
parse_html(document.r(), parse_input, &final_url, parse_html(document.r(), parse_input, final_url,
ParseContext::Owner(Some(incomplete.pipeline_id))); ParseContext::Owner(Some(incomplete.pipeline_id)));
page_remover.neuter(); page_remover.neuter();