Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-22 08:08:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make it possible to close a browsing context from the embedder

Browse source
This commit is contained in:
Paul Rouget 2017-08-22 06:49:05 +02:00
parent d7b7e7aea8
commit ecdcfa8226
4 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/compositing/compositor.rs
View file

@ -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) => { WindowEvent::SelectBrowser(ctx) => {
let msg = ConstellationMsg::SelectBrowser(ctx); let msg = ConstellationMsg::SelectBrowser(ctx);
if let Err(e) = self.constellation_chan.send(msg) { if let Err(e) = self.constellation_chan.send(msg) {

3
components/compositing/windowing.rs
View file

@ -73,6 +73,8 @@ pub enum WindowEvent {
Reload(TopLevelBrowsingContextId), Reload(TopLevelBrowsingContextId),
/// Create a new top level browsing context /// Create a new top level browsing context
NewBrowser(ServoUrl, IpcSender<TopLevelBrowsingContextId>), NewBrowser(ServoUrl, IpcSender<TopLevelBrowsingContextId>),
/// Close a top level browsing context
CloseBrowser(TopLevelBrowsingContextId),
/// Make a top level browsing context visible, hiding the previous /// Make a top level browsing context visible, hiding the previous
/// visible one. /// visible one.
SelectBrowser(TopLevelBrowsingContextId), SelectBrowser(TopLevelBrowsingContextId),
@ -99,6 +101,7 @@ impl Debug for WindowEvent {
WindowEvent::ToggleWebRenderProfiler => write!(f, "ToggleWebRenderProfiler"), WindowEvent::ToggleWebRenderProfiler => write!(f, "ToggleWebRenderProfiler"),
WindowEvent::Reload(..) => write!(f, "Reload"), WindowEvent::Reload(..) => write!(f, "Reload"),
WindowEvent::NewBrowser(..) => write!(f, "NewBrowser"), WindowEvent::NewBrowser(..) => write!(f, "NewBrowser"),
WindowEvent::CloseBrowser(..) => write!(f, "CloseBrowser"),
WindowEvent::SelectBrowser(..) => write!(f, "SelectBrowser"), WindowEvent::SelectBrowser(..) => write!(f, "SelectBrowser"),
} }
} }

12
components/constellation/constellation.rs
View file

@ -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 // Create a new top level browsing context. Will use response_chan to return
// the browsing context id. // the browsing context id.
FromCompositorMsg::NewBrowser(url, response_chan) => { 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); 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. // Send frame tree to WebRender. Make it visible.
FromCompositorMsg::SelectBrowser(top_level_browsing_context_id) => { FromCompositorMsg::SelectBrowser(top_level_browsing_context_id) => {
self.send_frame_tree(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, fn handle_iframe_size_msg(&mut self,
iframe_sizes: Vec<(BrowsingContextId, TypedSize2D<f32, CSSPixel>)>) { iframe_sizes: Vec<(BrowsingContextId, TypedSize2D<f32, CSSPixel>)>) {
for (browsing_context_id, size) in iframe_sizes { for (browsing_context_id, size) in iframe_sizes {

2
components/script_traits/lib.rs
View file

@ -765,6 +765,8 @@ pub enum ConstellationMsg {
WebVREvents(Vec<PipelineId>, Vec<WebVREvent>), WebVREvents(Vec<PipelineId>, Vec<WebVREvent>),
/// Create a new top level browsing context. /// Create a new top level browsing context.
NewBrowser(ServoUrl, IpcSender<TopLevelBrowsingContextId>), NewBrowser(ServoUrl, IpcSender<TopLevelBrowsingContextId>),
/// Close a top level browsing context.
CloseBrowser(TopLevelBrowsingContextId),
/// Make browser visible. /// Make browser visible.
SelectBrowser(TopLevelBrowsingContextId), SelectBrowser(TopLevelBrowsingContextId),
} }