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

Update step numbers in HTMLScriptElement::prepare().

Browse source
This commit is contained in:
Ms2ger 2016-07-14 13:34:19 +02:00
parent f45b8bc53e
commit 1feeff2972
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/script/dom/htmlscriptelement.rs
View file

@ -267,22 +267,26 @@ impl HTMLScriptElement {
// TODO: Step 14: CORS. // TODO: Step 14: CORS.
// TODO: Step 15: environment settings object. // TODO: Step 15: Nonce.
// TODO: Step 16: Parser state.
// TODO: Step 17: environment settings object.
let base_url = doc.base_url(); let base_url = doc.base_url();
let is_external = match element.get_attribute(&ns!(), &atom!("src")) { let is_external = match element.get_attribute(&ns!(), &atom!("src")) {
// Step 16. // Step 18.
Some(ref src) => { Some(ref src) => {
// Step 16.1. // Step 18.1.
let src = src.value(); let src = src.value();
// Step 16.2. // Step 18.2.
if src.is_empty() { if src.is_empty() {
self.queue_error_event(); self.queue_error_event();
return NextParserState::Continue; return NextParserState::Continue;
} }
// Step 16.4-16.5. // Step 18.4-18.5.
let url = match base_url.join(&src) { let url = match base_url.join(&src) {
Err(_) => { Err(_) => {
error!("error parsing URL for script {}", &**src); error!("error parsing URL for script {}", &**src);
@ -292,7 +296,7 @@ impl HTMLScriptElement {
Ok(url) => url, Ok(url) => url,
}; };
// Step 16.6. // Step 18.6.
// TODO(#9186): use the fetch infrastructure. // TODO(#9186): use the fetch infrastructure.
let elem = Trusted::new(self); let elem = Trusted::new(self);
@ -323,9 +327,9 @@ impl HTMLScriptElement {
None => false, None => false,
}; };
// Step 18. // Step 20.
let deferred = element.has_attribute(&atom!("defer")); let deferred = element.has_attribute(&atom!("defer"));
// Step 18.a: has src, has defer, was parser-inserted, is not async. // Step 20.a: classic, has src, has defer, was parser-inserted, is not async.
if is_external && if is_external &&
deferred && deferred &&
was_parser_inserted && was_parser_inserted &&
@ -333,23 +337,23 @@ impl HTMLScriptElement {
doc.add_deferred_script(self); doc.add_deferred_script(self);
// Second part implemented in Document::process_deferred_scripts. // Second part implemented in Document::process_deferred_scripts.
return NextParserState::Continue; return NextParserState::Continue;
// Step 18.b: has src, was parser-inserted, is not async. // Step 20.b: classic, has src, was parser-inserted, is not async.
} else if is_external && } else if is_external &&
was_parser_inserted && was_parser_inserted &&
!async { !async {
doc.set_pending_parsing_blocking_script(Some(self)); doc.set_pending_parsing_blocking_script(Some(self));
// Second part implemented in the load result handler. // Second part implemented in the load result handler.
// Step 18.c: has src, isn't async, isn't non-blocking. // Step 20.c: classic, has src, isn't async, isn't non-blocking.
} else if is_external && } else if is_external &&
!async && !async &&
!self.non_blocking.get() { !self.non_blocking.get() {
doc.push_asap_in_order_script(self); doc.push_asap_in_order_script(self);
// Second part implemented in Document::process_asap_scripts. // Second part implemented in Document::process_asap_scripts.
// Step 18.d: has src. // Step 20.d: classic, has src.
} else if is_external { } else if is_external {
doc.add_asap_script(self); doc.add_asap_script(self);
// Second part implemented in Document::process_asap_scripts. // Second part implemented in Document::process_asap_scripts.
// Step 18.e: doesn't have src, was parser-inserted, is blocked on stylesheet. // Step 20.e: doesn't have src, was parser-inserted, is blocked on stylesheet.
} else if !is_external && } else if !is_external &&
was_parser_inserted && was_parser_inserted &&
// TODO: check for script nesting levels. // TODO: check for script nesting levels.
@ -357,7 +361,7 @@ impl HTMLScriptElement {
doc.set_pending_parsing_blocking_script(Some(self)); doc.set_pending_parsing_blocking_script(Some(self));
*self.load.borrow_mut() = Some(ScriptOrigin::Internal(text, base_url)); *self.load.borrow_mut() = Some(ScriptOrigin::Internal(text, base_url));
self.ready_to_be_parser_executed.set(true); self.ready_to_be_parser_executed.set(true);
// Step 18.f: otherwise. // Step 20.f: otherwise.
} else { } else {
assert!(!text.is_empty()); assert!(!text.is_empty());
self.ready_to_be_parser_executed.set(true); self.ready_to_be_parser_executed.set(true);