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

Simplify the processing of asap scripts

Browse source
This commit is contained in:
Anthony Ramine 2017-01-20 15:25:24 +01:00
parent 1f76aa6ef7
commit f7df804630
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/script/dom/document.rs
View file

@ -229,7 +229,7 @@ pub struct Document {
/// https://html.spec.whatwg.org/multipage/#list-of-scripts-that-will-execute-in-order-as-soon-as-possible /// https://html.spec.whatwg.org/multipage/#list-of-scripts-that-will-execute-in-order-as-soon-as-possible
asap_in_order_scripts_list: PendingInOrderScriptVec, asap_in_order_scripts_list: PendingInOrderScriptVec,
/// https://html.spec.whatwg.org/multipage/#set-of-scripts-that-will-execute-as-soon-as-possible /// https://html.spec.whatwg.org/multipage/#set-of-scripts-that-will-execute-as-soon-as-possible
asap_scripts_set: DOMRefCell<VecDeque<PendingScript>>, asap_scripts_set: DOMRefCell<Vec<JS<HTMLScriptElement>>>,
/// https://html.spec.whatwg.org/multipage/#concept-n-noscript /// https://html.spec.whatwg.org/multipage/#concept-n-noscript
/// True if scripting is enabled for all scripts in this document /// True if scripting is enabled for all scripts in this document
scripting_enabled: Cell<bool>, scripting_enabled: Cell<bool>,
@ -1549,7 +1549,7 @@ impl Document {
if let LoadType::Script(_) = load { if let LoadType::Script(_) = load {
self.process_deferred_scripts(); self.process_deferred_scripts();
self.process_asap_scripts(); self.process_asap_scripts_in_order();
} }
if let Some(parser) = self.get_current_parser() { if let Some(parser) = self.get_current_parser() {
@ -1601,16 +1601,18 @@ impl Document {
} }
pub fn add_asap_script(&self, script: &HTMLScriptElement) { pub fn add_asap_script(&self, script: &HTMLScriptElement) {
self.asap_scripts_set.borrow_mut().push_back(PendingScript::new(script)); self.asap_scripts_set.borrow_mut().push(JS::from_ref(script));
} }
/// https://html.spec.whatwg.org/multipage/#the-end step 3. /// https://html.spec.whatwg.org/multipage/#the-end step 3.
/// https://html.spec.whatwg.org/multipage/#prepare-a-script step 22.d. /// https://html.spec.whatwg.org/multipage/#prepare-a-script step 22.d.
pub fn asap_script_loaded(&self, element: &HTMLScriptElement, result: ScriptResult) { pub fn asap_script_loaded(&self, element: &HTMLScriptElement, result: ScriptResult) {
let mut scripts = self.asap_scripts_set.borrow_mut(); {
let idx = scripts.iter().position(|entry| &*entry.element == element).unwrap(); let mut scripts = self.asap_scripts_set.borrow_mut();
scripts.swap(0, idx); let idx = scripts.iter().position(|entry| &**entry == element).unwrap();
scripts[0].loaded(result); scripts.swap_remove(idx);
}
element.execute(result);
} }
pub fn push_asap_in_order_script(&self, script: &HTMLScriptElement) { pub fn push_asap_in_order_script(&self, script: &HTMLScriptElement) {
@ -1625,12 +1627,7 @@ impl Document {
self.asap_in_order_scripts_list.loaded(element, result); self.asap_in_order_scripts_list.loaded(element, result);
} }
fn process_asap_scripts(&self) { fn process_asap_scripts_in_order(&self) {
let pair = self.asap_scripts_set.borrow_mut().front_mut().and_then(PendingScript::take_result);
if let Some((element, result)) = pair {
self.asap_scripts_set.borrow_mut().pop_front();
element.execute(result);
}
while let Some((element, result)) = self.asap_in_order_scripts_list.take_next_ready_to_be_executed() { while let Some((element, result)) = self.asap_in_order_scripts_list.take_next_ready_to_be_executed() {
element.execute(result); element.execute(result);
} }