diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-01-11 09:37:23 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-11 09:37:23 -0800 |
commit | d1bc1a4f1b66ab9f63fa37f649eaf79035e12f8e (patch) | |
tree | c08456ddc75306ba152727d5e7fb680bc8d8c7ae /components/script/dom/servoparser/mod.rs | |
parent | e440a016051703632cac1de6b88ff9e0c94e9017 (diff) | |
parent | 30f0553ac744789705a3cf67ffce91f2ed5beb3e (diff) | |
download | servo-d1bc1a4f1b66ab9f63fa37f649eaf79035e12f8e.tar.gz servo-d1bc1a4f1b66ab9f63fa37f649eaf79035e12f8e.zip |
Auto merge of #14959 - nox:pending-script, r=Ms2ger
Introduce PendingScript
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14959)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/servoparser/mod.rs')
-rw-r--r-- | components/script/dom/servoparser/mod.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/servoparser/mod.rs b/components/script/dom/servoparser/mod.rs index 2abed929231..a6c27804295 100644 --- a/components/script/dom/servoparser/mod.rs +++ b/components/script/dom/servoparser/mod.rs @@ -19,7 +19,7 @@ use dom::element::Element; use dom::globalscope::GlobalScope; use dom::htmlformelement::HTMLFormElement; use dom::htmlimageelement::HTMLImageElement; -use dom::htmlscriptelement::HTMLScriptElement; +use dom::htmlscriptelement::{HTMLScriptElement, ScriptResult}; use dom::node::{Node, NodeSiblingIterator}; use dom::text::Text; use encoding::all::UTF_8; @@ -171,7 +171,7 @@ impl ServoParser { /// ^ /// insertion point /// ``` - pub fn resume_with_pending_parsing_blocking_script(&self, script: &HTMLScriptElement) { + pub fn resume_with_pending_parsing_blocking_script(&self, script: &HTMLScriptElement, result: ScriptResult) { assert!(self.suspended.get()); self.suspended.set(false); @@ -184,7 +184,7 @@ impl ServoParser { assert_eq!(script_nesting_level, 0); self.script_nesting_level.set(script_nesting_level + 1); - script.execute(); + script.execute(result); self.script_nesting_level.set(script_nesting_level); if !self.suspended.get() { @@ -196,7 +196,7 @@ impl ServoParser { pub fn write(&self, text: Vec<DOMString>) { assert!(self.script_nesting_level.get() > 0); - if self.document.get_pending_parsing_blocking_script().is_some() { + if self.document.has_pending_parsing_blocking_script() { // There is already a pending parsing blocking script so the // parser is suspended, we just append everything to the // script input and abort these steps. @@ -326,7 +326,7 @@ impl ServoParser { script.prepare(); self.script_nesting_level.set(script_nesting_level); - if self.document.get_pending_parsing_blocking_script().is_some() { + if self.document.has_pending_parsing_blocking_script() { self.suspended.set(true); return; } |