From ffffc5f06551f791be7457c6fc0d0fa20e1e782e Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 5 Nov 2015 16:30:22 +0100 Subject: [PATCH] Remove the unused PipelineExitType argument from Pipeline::exit. --- components/compositing/constellation.rs | 6 +++--- components/compositing/pipeline.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs index adfb9fb5b21..c4b1c9bd5d4 100644 --- a/components/compositing/constellation.rs +++ b/components/compositing/constellation.rs @@ -25,7 +25,7 @@ use msg::compositor_msg::Epoch; use msg::constellation_msg::AnimationState; use msg::constellation_msg::Msg as ConstellationMsg; use msg::constellation_msg::WebDriverCommandMsg; -use msg::constellation_msg::{FrameId, PipelineExitType, PipelineId}; +use msg::constellation_msg::{FrameId, PipelineId}; use msg::constellation_msg::{IframeLoadInfo, IFrameSandboxState, MozBrowserEvent, NavigationDirection}; use msg::constellation_msg::{Key, KeyModifiers, KeyState, LoadData}; use msg::constellation_msg::{PipelineNamespace, PipelineNamespaceId}; @@ -565,7 +565,7 @@ impl Constellation { fn handle_exit(&mut self) { for (_id, ref pipeline) in &self.pipelines { - pipeline.exit(PipelineExitType::Complete); + pipeline.exit(); } self.image_cache_task.exit(); self.resource_task.send(net_traits::ControlMsg::Exit).unwrap(); @@ -1356,7 +1356,7 @@ impl Constellation { // Inform script, compositor that this pipeline has exited. match exit_mode { - ExitPipelineMode::Normal => pipeline.exit(PipelineExitType::PipelineOnly), + ExitPipelineMode::Normal => pipeline.exit(), ExitPipelineMode::Force => pipeline.force_exit(), } } diff --git a/components/compositing/pipeline.rs b/components/compositing/pipeline.rs index 0215ac4cade..75d166f5f76 100644 --- a/components/compositing/pipeline.rs +++ b/components/compositing/pipeline.rs @@ -248,7 +248,7 @@ impl Pipeline { let _ = self.chrome_to_paint_chan.send(ChromeToPaintMsg::PaintPermissionRevoked); } - pub fn exit(&self, _: PipelineExitType) { + pub fn exit(&self) { debug!("pipeline {:?} exiting", self.id); // Script task handles shutting down layout, and layout handles shutting down the painter.