Make it possible to close a browsing context from the embedder

4 files changed, 23 insertions, 1 deletions

diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index c5ceec0aa1f..b9dbec1a513 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -811,6 +811,13 @@ impl<Window: WindowMethods> IOCompositor<Window> {
                 }
             }
 
+            WindowEvent::CloseBrowser(ctx) => {
+                let msg = ConstellationMsg::CloseBrowser(ctx);
+                if let Err(e) = self.constellation_chan.send(msg) {
+                    warn!("Sending CloseBrowser message to constellation failed ({}).", e);
+                }
+            }
+
             WindowEvent::SelectBrowser(ctx) => {
                 let msg = ConstellationMsg::SelectBrowser(ctx);
                 if let Err(e) = self.constellation_chan.send(msg) {
diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs
index cceaaf9fce8..1b901c8bd4e 100644
--- a/components/compositing/windowing.rs
+++ b/components/compositing/windowing.rs
@@ -73,6 +73,8 @@ pub enum WindowEvent {
     Reload(TopLevelBrowsingContextId),
     /// Create a new top level browsing context
     NewBrowser(ServoUrl, IpcSender<TopLevelBrowsingContextId>),
+    /// Close a top level browsing context
+    CloseBrowser(TopLevelBrowsingContextId),
     /// Make a top level browsing context visible, hiding the previous
     /// visible one.
     SelectBrowser(TopLevelBrowsingContextId),
@@ -99,6 +101,7 @@ impl Debug for WindowEvent {
             WindowEvent::ToggleWebRenderProfiler => write!(f, "ToggleWebRenderProfiler"),
             WindowEvent::Reload(..) => write!(f, "Reload"),
             WindowEvent::NewBrowser(..) => write!(f, "NewBrowser"),
+            WindowEvent::CloseBrowser(..) => write!(f, "CloseBrowser"),
             WindowEvent::SelectBrowser(..) => write!(f, "SelectBrowser"),
         }
     }
diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
index 3e9b0cc80be..6cd6fc6f641 100644
--- a/components/constellation/constellation.rs
+++ b/components/constellation/constellation.rs
@@ -974,9 +974,14 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
             // Create a new top level browsing context. Will use response_chan to return
             // the browsing context id.
             FromCompositorMsg::NewBrowser(url, response_chan) => {
-                debug!("constellation got init load URL message");
+                debug!("constellation got NewBrowser message");
                 self.handle_new_top_level_browsing_context(url, response_chan);
             }
+            // Close a top level browsing context.
+            FromCompositorMsg::CloseBrowser(top_level_browsing_context_id) => {
+                debug!("constellation got CloseBrowser message");
+                self.handle_close_top_level_browsing_context(top_level_browsing_context_id);
+            }
             // Send frame tree to WebRender. Make it visible.
             FromCompositorMsg::SelectBrowser(top_level_browsing_context_id) => {
                 self.send_frame_tree(top_level_browsing_context_id);
@@ -1540,6 +1545,11 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
         });
     }
 
+    fn handle_close_top_level_browsing_context(&mut self, top_level_browsing_context_id: TopLevelBrowsingContextId) {
+        let browsing_context_id = BrowsingContextId::from(top_level_browsing_context_id);
+        self.close_browsing_context(browsing_context_id, ExitPipelineMode::Normal);
+    }
+
     fn handle_iframe_size_msg(&mut self,
                               iframe_sizes: Vec<(BrowsingContextId, TypedSize2D<f32, CSSPixel>)>) {
         for (browsing_context_id, size) in iframe_sizes {
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs
index 4a197e759ff..6c48fd4061e 100644
--- a/components/script_traits/lib.rs
+++ b/components/script_traits/lib.rs
@@ -765,6 +765,8 @@ pub enum ConstellationMsg {
     WebVREvents(Vec<PipelineId>, Vec<WebVREvent>),
     /// Create a new top level browsing context.
     NewBrowser(ServoUrl, IpcSender<TopLevelBrowsingContextId>),
+    /// Close a top level browsing context.
+    CloseBrowser(TopLevelBrowsingContextId),
     /// Make browser visible.
     SelectBrowser(TopLevelBrowsingContextId),
 }