From 2416072dc2b264191ab9a6515a8f9c3415849b71 Mon Sep 17 00:00:00 2001
From: Alan Jeffrey <ajeffrey@mozilla.com>
Date: Thu, 2 Jun 2016 15:12:00 -0500
Subject: Avoid deadlock when shutting down.

---
 components/script/script_thread.rs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'components/script/script_thread.rs')

diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 35ae783f5ff..ed2b0e03ee8 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -1407,6 +1407,7 @@ impl ScriptThread {
         if window.pipeline() == id {
             debug!("shutting down layout for root context {:?}", id);
             shut_down_layout(&context);
+            let _ = self.constellation_chan.send(ConstellationMsg::PipelineExited(id));
             return true
         }
 
@@ -1414,6 +1415,7 @@ impl ScriptThread {
         if let Some(ref mut child_context) = context.remove(id) {
             shut_down_layout(&child_context);
         }
+        let _ = self.constellation_chan.send(ConstellationMsg::PipelineExited(id));
         false
     }
 
-- 
cgit v1.2.3