Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix steps numbering of HTMLScriptExecute::prepare

Browse source
This commit is contained in:
Anthony Ramine 2017-01-10 14:57:10 +01:00
parent 124301cf48
commit a64ed5dfbd
1 changed files with 41 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,6 +40,7 @@ use std::ascii::AsciiExt;
use std::cell::Cell; use std::cell::Cell;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use style::str::{HTML_SPACE_CHARACTERS, StaticStringVec}; use style::str::{HTML_SPACE_CHARACTERS, StaticStringVec};
#[dom_struct] #[dom_struct]
pub struct HTMLScriptElement { pub struct HTMLScriptElement {
htmlelement: HTMLElement, htmlelement: HTMLElement,
@ -364,9 +365,11 @@ impl HTMLScriptElement {
_ => unreachable!() _ => unreachable!()
}; };
// TODO: Step 15: Nonce. // TODO: Step 15: Module script credentials mode.
// Step 16: Integrity Metadata // TODO: Step 16: Nonce.
// Step 17: Integrity metadata.
let im_attribute = element.get_attribute(&ns!(), &local_name!("integrity")); let im_attribute = element.get_attribute(&ns!(), &local_name!("integrity"));
let integrity_val = im_attribute.r().map(|a| a.value()); let integrity_val = im_attribute.r().map(|a| a.value());
let integrity_metadata = match integrity_val { let integrity_metadata = match integrity_val {
@ -374,66 +377,70 @@ impl HTMLScriptElement {
None => "", None => "",
}; };
// TODO: Step 17: environment settings object. // TODO: Step 18: parser state.
// TODO: Step 19: environment settings object.
let base_url = doc.base_url(); let base_url = doc.base_url();
let is_external = match element.get_attribute(&ns!(), &local_name!("src")) { let is_external = if let Some(src) = element.get_attribute(&ns!(), &local_name!("src")) {
// Step 18. // Step 20.
Some(ref src) => {
// Step 18.1.
let src = src.value();
// Step 18.2. // Step 20.1.
if src.is_empty() { let src = src.value();
// Step 20.2.
if src.is_empty() {
self.queue_error_event();
return;
}
// Step 20.3: The "from an external file"" flag is stored in ScriptOrigin.
// Step 20.4-20.5.
let url = match base_url.join(&src) {
Ok(url) => url,
Err(_) => {
warn!("error parsing URL for script {}", &**src);
self.queue_error_event(); self.queue_error_event();
return; return;
} },
};
// Step 18.4-18.5. // Step 20.6.
let url = match base_url.join(&src) { fetch_a_classic_script(self, url, cors_setting, integrity_metadata.to_owned(), encoding);
Err(_) => {
warn!("error parsing URL for script {}", &**src);
self.queue_error_event();
return;
}
Ok(url) => url,
};
// Step 18.6. true
fetch_a_classic_script(self, url, cors_setting, integrity_metadata.to_owned(), encoding); } else {
// TODO: Step 21.
true false
},
// TODO: Step 19.
None => false,
}; };
// Step 20. // Step 22.
let deferred = element.has_attribute(&local_name!("defer")); let deferred = element.has_attribute(&local_name!("defer"));
// Step 20.a: classic, has src, has defer, was parser-inserted, is not async. // Step 22.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 &&
!async { !async {
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.
// Step 20.b: classic, has src, was parser-inserted, is not async. // Step 22.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 20.c: classic, has src, isn't async, isn't non-blocking. // Step 22.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 20.d: classic, has src. // Step 22.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 20.e: doesn't have src, was parser-inserted, is blocked on stylesheet. // Step 22.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 &&
doc.get_current_parser().map_or(false, |parser| parser.script_nesting_level() <= 1) && doc.get_current_parser().map_or(false, |parser| parser.script_nesting_level() <= 1) &&
@ -441,7 +448,7 @@ impl HTMLScriptElement {
doc.set_pending_parsing_blocking_script(Some(self)); doc.set_pending_parsing_blocking_script(Some(self));
*self.load.borrow_mut() = Some(Ok(ScriptOrigin::internal(text, base_url))); *self.load.borrow_mut() = Some(Ok(ScriptOrigin::internal(text, base_url)));
self.ready_to_be_parser_executed.set(true); self.ready_to_be_parser_executed.set(true);
// Step 20.f: otherwise. // Step 22.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);