Drop TrustedPromise before dropping JSRuntime

servo · Oct 21, 2018 · bca951d · bca951d
1 parent 2304f02
commit bca951d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/components/script/dom/bindings/refcounted.rs b/components/script/dom/bindings/refcounted.rs
@@ -224,6 +224,12 @@ impl LiveDOMReferences {
         });
     }
 
+    pub fn destruct() {
+        LIVE_REFERENCES.with(|ref r| {
+            *r.borrow_mut() = None;
+        });
+    }
+
     #[allow(unrooted_must_root)]
     fn addref_promise(&self, promise: Rc<Promise>) {
         let mut table = self.promise_table.borrow_mut();

diff --git a/components/script/script_runtime.rs b/components/script/script_runtime.rs
@@ -145,7 +145,10 @@ pub struct Runtime(RustRuntime);
 
 impl Drop for Runtime {
     fn drop(&mut self) {
-        THREAD_ACTIVE.with(|t| t.set(false));
+        THREAD_ACTIVE.with(|t| {
+            LiveDOMReferences::destruct();
+            t.set(false);
+        });
     }
 }