From 7d3f7220f7b436301329a05f3a3c01cc5775bdf0 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Thu, 5 Nov 2015 16:32:08 +0100
Subject: [PATCH] Remove the unused PipelineExitType field from
 LayoutControlMsg::ExitNow.

---
 components/compositing/pipeline.rs | 5 ++---
 components/layout/layout_task.rs   | 2 +-
 components/script_traits/lib.rs    | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/components/compositing/pipeline.rs b/components/compositing/pipeline.rs
index 2bc78c22ed2..4cc8b87f14a 100644
--- a/components/compositing/pipeline.rs
+++ b/components/compositing/pipeline.rs
@@ -15,7 +15,7 @@ use ipc_channel::router::ROUTER;
 use layers::geometry::DevicePixel;
 use layout_traits::{LayoutControlChan, LayoutTaskFactory};
 use msg::constellation_msg::{ConstellationChan, Failure, FrameId, PipelineId, SubpageId};
-use msg::constellation_msg::{LoadData, MozBrowserEvent, PipelineExitType, WindowSizeData};
+use msg::constellation_msg::{LoadData, MozBrowserEvent, WindowSizeData};
 use msg::constellation_msg::{PipelineNamespaceId};
 use net_traits::ResourceTask;
 use net_traits::image_cache_task::ImageCacheTask;
@@ -278,8 +278,7 @@ impl Pipeline {
         let _ = self.script_chan.send(ConstellationControlMsg::ExitPipeline(self.id)).unwrap();
         let _ = self.chrome_to_paint_chan.send(ChromeToPaintMsg::Exit);
         let LayoutControlChan(ref layout_channel) = self.layout_chan;
-        let _ = layout_channel.send(
-            LayoutControlMsg::ExitNow(PipelineExitType::PipelineOnly)).unwrap();
+        let _ = layout_channel.send(LayoutControlMsg::ExitNow).unwrap();
     }
 
     pub fn to_sendable(&self) -> CompositionPipeline {
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index 8b3a1555af5..15942e96958 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -492,7 +492,7 @@ impl LayoutTask {
                         self.handle_request_helper(Msg::GetWebFontLoadState(sender),
                                                    possibly_locked_rw_data)
                     }
-                    LayoutControlMsg::ExitNow(_) => {
+                    LayoutControlMsg::ExitNow => {
                         self.handle_request_helper(Msg::ExitNow,
                                                    possibly_locked_rw_data)
                     }
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs
index 1adf0c6602d..0978e1700ec 100644
--- a/components/script_traits/lib.rs
+++ b/components/script_traits/lib.rs
@@ -33,7 +33,7 @@ use libc::c_void;
 use msg::compositor_msg::{Epoch, LayerId, ScriptToCompositorMsg};
 use msg::constellation_msg::{ConstellationChan, Failure, PipelineId, WindowSizeData};
 use msg::constellation_msg::{Key, KeyModifiers, KeyState, LoadData, SubpageId};
-use msg::constellation_msg::{MozBrowserEvent, PipelineExitType, PipelineNamespaceId};
+use msg::constellation_msg::{MozBrowserEvent, PipelineNamespaceId};
 use msg::webdriver_msg::WebDriverScriptCommand;
 use net_traits::ResourceTask;
 use net_traits::image_cache_task::ImageCacheTask;
@@ -55,7 +55,7 @@ unsafe impl Send for UntrustedNodeAddress {}
 #[derive(Deserialize, Serialize)]
 pub enum LayoutControlMsg {
     /// Requests that this layout task exit.
-    ExitNow(PipelineExitType),
+    ExitNow,
     /// Requests the current epoch (layout counter) from this layout.
     GetCurrentEpoch(IpcSender<Epoch>),
     /// Asks layout to run another step in its animation.