diff --git a/components/compositing/pipeline.rs b/components/compositing/pipeline.rs index 51b4a20ec9c..0215ac4cade 100644 --- a/components/compositing/pipeline.rs +++ b/components/compositing/pipeline.rs @@ -248,13 +248,13 @@ impl Pipeline { let _ = self.chrome_to_paint_chan.send(ChromeToPaintMsg::PaintPermissionRevoked); } - pub fn exit(&self, exit_type: PipelineExitType) { + pub fn exit(&self, _: PipelineExitType) { debug!("pipeline {:?} exiting", self.id); // Script task handles shutting down layout, and layout handles shutting down the painter. // For now, if the script task has failed, we give up on clean shutdown. if self.script_chan - .send(ConstellationControlMsg::ExitPipeline(self.id, exit_type)) + .send(ConstellationControlMsg::ExitPipeline(self.id)) .is_ok() { // Wait until all slave tasks have terminated and run destructors // NOTE: We don't wait for script task as we don't always own it @@ -275,9 +275,7 @@ impl Pipeline { } pub fn force_exit(&self) { - let _ = self.script_chan.send( - ConstellationControlMsg::ExitPipeline(self.id, - PipelineExitType::PipelineOnly)).unwrap(); + let _ = self.script_chan.send(ConstellationControlMsg::ExitPipeline(self.id)).unwrap(); let _ = self.chrome_to_paint_chan.send(ChromeToPaintMsg::Exit( PipelineExitType::PipelineOnly)); let LayoutControlChan(ref layout_channel) = self.layout_chan; diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 3949f7f2b8a..d463d1d8107 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -839,7 +839,7 @@ impl ScriptTask { let result = self.profile_event(category, move || { match msg { - MixedMessage::FromConstellation(ConstellationControlMsg::ExitPipeline(id, _)) => { + MixedMessage::FromConstellation(ConstellationControlMsg::ExitPipeline(id)) => { if self.handle_exit_pipeline_msg(id) { return Some(false) } diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 2db79ff93d3..1adf0c6602d 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -115,7 +115,7 @@ pub enum ConstellationControlMsg { /// Notifies script that window has been resized but to not take immediate action. ResizeInactive(PipelineId, WindowSizeData), /// Notifies the script that a pipeline should be closed. - ExitPipeline(PipelineId, PipelineExitType), + ExitPipeline(PipelineId), /// Sends a DOM event. SendEvent(PipelineId, CompositorEvent), /// Notifies script of the viewport.