Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4293 : Ms2ger/servo/script_task, r=Manishearth

Browse source
This commit is contained in:
bors-servo 2014-12-09 04:57:56 -07:00
commit 02955d39cc
2 changed files with 37 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@ use string_cache::QualName;
pub enum HTMLInput { pub enum HTMLInput {
InputString(String), InputString(String),
InputUrl(Url), InputUrl(LoadResponse),
} }
trait SinkHelpers { trait SinkHelpers {
@ -163,9 +163,8 @@ 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: Url, url: Url) {
load_response: Option<LoadResponse>) { let parser = ServoHTMLParser::new(Some(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);
@ -174,11 +173,10 @@ pub fn parse_html(document: JSRef<Document>,
InputString(s) => { InputString(s) => {
parser.parse_chunk(s); parser.parse_chunk(s);
} }
InputUrl(url) => { InputUrl(load_response) => {
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.serialize()); let page = format!("<html><body><img src='{:s}' /></body></html>", url.serialize());
parser.parse_chunk(page); parser.parse_chunk(page);
}, },
_ => { _ => {

73
components/script/script_task.rs
View file

@ -744,53 +744,44 @@ impl ScriptTask {
}); });
} }
let parser_input = if !is_javascript { let (parser_input, base_url) = if !is_javascript {
InputUrl(url.clone()) // Wait for the LoadResponse so that the parser knows the final URL.
let (input_chan, input_port) = channel();
self.resource_task.send(Load(NetLoadData {
url: url,
method: load_data.method,
headers: load_data.headers,
data: load_data.data,
cors: None,
consumer: input_chan,
}));
let load_response = input_port.recv();
load_response.metadata.headers.as_ref().map(|headers| {
headers.get().map(|&LastModified(ref tm)| {
document.set_last_modified(dom_last_modified(tm));
});
});
let base_url = load_response.metadata.final_url.clone();
{
// Store the final URL before we start parsing, so that DOM routines
// (e.g. HTMLImageElement::update_image) can resolve relative URLs
// correctly.
*page.mut_url() = Some((base_url.clone(), true));
}
(InputUrl(load_response), base_url)
} else { } else {
let evalstr = load_data.url.non_relative_scheme_data().unwrap(); let evalstr = load_data.url.non_relative_scheme_data().unwrap();
let jsval = window.evaluate_js_with_result(evalstr); let jsval = window.evaluate_js_with_result(evalstr);
let strval = FromJSValConvertible::from_jsval(self.get_cx(), jsval, Empty); let strval = FromJSValConvertible::from_jsval(self.get_cx(), jsval, Empty);
InputString(strval.unwrap_or("".to_string())) (InputString(strval.unwrap_or("".to_string())), doc_url)
}; };
let (base_url, load_response) = match parser_input { parse_html(*document, parser_input, base_url);
InputUrl(ref url) => {
// Wait for the LoadResponse so that the parser knows the final URL.
let (input_chan, input_port) = channel();
self.resource_task.send(Load(NetLoadData {
url: url.clone(),
method: load_data.method,
headers: load_data.headers,
data: load_data.data,
cors: None,
consumer: input_chan,
}));
let load_response = input_port.recv();
load_response.metadata.headers.as_ref().map(|headers| {
headers.get().map(|&LastModified(ref tm)| {
document.set_last_modified(dom_last_modified(tm));
});
});
let base_url = load_response.metadata.final_url.clone();
{
// Store the final URL before we start parsing, so that DOM routines
// (e.g. HTMLImageElement::update_image) can resolve relative URLs
// correctly.
*page.mut_url() = Some((base_url.clone(), true));
}
(base_url, Some(load_response))
},
InputString(_) => {
(doc_url, None)
},
};
parse_html(*document, parser_input, base_url, load_response);
url = page.get_url().clone(); url = page.get_url().clone();
document.set_ready_state(DocumentReadyStateValues::Interactive); document.set_ready_state(DocumentReadyStateValues::Interactive);