aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2017-01-10 18:45:58 +0100
committerAnthony Ramine <n.oxyde@gmail.com>2017-01-10 21:57:02 +0100
commit749ac4285422c8da71dca3d308c4424a882ebace (patch)
tree81a312fba05a4a435edcb1512319cef7c8c8628e /components/script/dom
parentc784bc69443ee6f4f3bd54474ac0e03a2bb92a6f (diff)
downloadservo-749ac4285422c8da71dca3d308c4424a882ebace.tar.gz
servo-749ac4285422c8da71dca3d308c4424a882ebace.zip
Do not pass an Option to Document::set_pending_parsing_blocking_script
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/document.rs6
-rw-r--r--components/script/dom/htmlscriptelement.rs4
2 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index bfc98d61b0f..74838618454 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -1450,9 +1450,9 @@ impl Document {
changed
}
- pub fn set_pending_parsing_blocking_script(&self, script: Option<&HTMLScriptElement>) {
- assert!(self.get_pending_parsing_blocking_script().is_none() || script.is_none());
- self.pending_parsing_blocking_script.set(script);
+ pub fn set_pending_parsing_blocking_script(&self, script: &HTMLScriptElement) {
+ assert!(self.get_pending_parsing_blocking_script().is_none());
+ self.pending_parsing_blocking_script.set(Some(script));
}
pub fn get_pending_parsing_blocking_script(&self) -> Option<Root<HTMLScriptElement>> {
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index f2eb73123fd..a1ed82915ab 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -427,7 +427,7 @@ impl HTMLScriptElement {
// Step 22.
match kind {
ExternalScriptKind::Deferred => doc.add_deferred_script(self),
- ExternalScriptKind::ParsingBlocking => doc.set_pending_parsing_blocking_script(Some(self)),
+ ExternalScriptKind::ParsingBlocking => doc.set_pending_parsing_blocking_script(self),
ExternalScriptKind::AsapInOrder => doc.push_asap_in_order_script(self),
ExternalScriptKind::Asap => doc.add_asap_script(self),
}
@@ -442,7 +442,7 @@ impl HTMLScriptElement {
doc.get_current_parser().map_or(false, |parser| parser.script_nesting_level() <= 1) &&
doc.get_script_blocking_stylesheets_count() > 0 {
// Step 22.e: classic, has no src, was parser-inserted, is blocked on stylesheet.
- doc.set_pending_parsing_blocking_script(Some(self));
+ doc.set_pending_parsing_blocking_script(self);
} else {
// Step 22.f: otherwise.
self.execute();