Do not pass an Option to Document::set_pending_parsing_blocking_script

servo · Jan 10, 2017 · 749ac42 · 749ac42
1 parent c784bc6
commit 749ac42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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();