From 2753e5efabd77b83dd94bf59fe3f01535e8ac10a Mon Sep 17 00:00:00 2001 From: Gregory Terzian Date: Sat, 26 May 2018 23:41:34 +0800 Subject: improve spec compliance of window.close --- components/script/script_thread.rs | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'components/script/script_thread.rs') diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index a28bdfbb5bf..1852e467189 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -220,9 +220,6 @@ enum MixedMessage { pub enum MainThreadScriptMsg { /// Common variants associated with the script messages Common(CommonScriptMsg), - /// Notifies the script that a window associated with a particular pipeline - /// should be closed (only dispatched to ScriptThread). - ExitWindow(PipelineId), /// Begins a content-initiated load on the specified pipeline (only /// dispatched to ScriptThread). Allows for a replace bool to be passed. If true, /// the current entry will be replaced instead of a new entry being added. @@ -1193,7 +1190,6 @@ impl ScriptThread { MainThreadScriptMsg::Common(CommonScriptMsg::Task(_, _, pipeline_id)) => pipeline_id, MainThreadScriptMsg::Common(CommonScriptMsg::CollectReports(_)) => None, - MainThreadScriptMsg::ExitWindow(pipeline_id) => Some(pipeline_id), MainThreadScriptMsg::Navigate(pipeline_id, ..) => Some(pipeline_id), MainThreadScriptMsg::WorkletLoaded(pipeline_id) => Some(pipeline_id), MainThreadScriptMsg::RegisterPaintWorklet { pipeline_id, .. } => Some(pipeline_id), @@ -1344,9 +1340,6 @@ impl ScriptThread { MainThreadScriptMsg::Navigate(parent_pipeline_id, load_data, replace) => { self.handle_navigate(parent_pipeline_id, None, load_data, replace) }, - MainThreadScriptMsg::ExitWindow(id) => { - self.handle_exit_window_msg(id) - }, MainThreadScriptMsg::Common(CommonScriptMsg::Task(_, task, _)) => { task.run_box() } @@ -1715,20 +1708,6 @@ impl ScriptThread { window.set_window_size(new_size); } - /// We have gotten a window.close from script, which we pass on to the compositor. - /// We do not shut down the script thread now, because the compositor will ask the - /// constellation to shut down the pipeline, which will clean everything up - /// normally. If we do exit, we will tear down the DOM nodes, possibly at a point - /// where layout is still accessing them. - fn handle_exit_window_msg(&self, id: PipelineId) { - debug!("script thread handling exit window msg"); - - // TODO(tkuehn): currently there is only one window, - // so this can afford to be naive and just shut down the - // constellation. In the future it'll need to be smarter. - self.script_sender.send((id, ScriptMsg::Exit)).unwrap(); - } - /// We have received notification that the response associated with a load has completed. /// Kick off the document and frame tree creation process using the result. fn handle_page_headers_available(&self, id: &PipelineId, -- cgit v1.2.3