From ad33d920e702b4fb0752d83e10b9a6073d2cb66b Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Thu, 5 Nov 2015 16:11:52 +0100
Subject: [PATCH] Remove the unused PipelineExitType field from
 layout_interface::Msg::ExitNow.

---
 components/layout/layout_task.rs      | 8 ++++----
 components/script/layout_interface.rs | 4 ++--
 components/script/script_task.rs      | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index 1a5fea87482..8b3a1555af5 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -492,8 +492,8 @@ impl LayoutTask {
                         self.handle_request_helper(Msg::GetWebFontLoadState(sender),
                                                    possibly_locked_rw_data)
                     }
-                    LayoutControlMsg::ExitNow(exit_type) => {
-                        self.handle_request_helper(Msg::ExitNow(exit_type),
+                    LayoutControlMsg::ExitNow(_) => {
+                        self.handle_request_helper(Msg::ExitNow,
                                                    possibly_locked_rw_data)
                     }
                 }
@@ -631,7 +631,7 @@ impl LayoutTask {
                 self.prepare_to_exit(response_chan, possibly_locked_rw_data);
                 return false
             },
-            Msg::ExitNow(_) => {
+            Msg::ExitNow => {
                 debug!("layout: ExitNow received");
                 self.exit_now(possibly_locked_rw_data);
                 return false
@@ -711,7 +711,7 @@ impl LayoutTask {
                         self.handle_reap_layout_data(dead_layout_data)
                     }
                 }
-                Msg::ExitNow(_) => {
+                Msg::ExitNow => {
                     debug!("layout task is exiting...");
                     self.exit_now(possibly_locked_rw_data);
                     break
diff --git a/components/script/layout_interface.rs b/components/script/layout_interface.rs
index afc7adedbd3..7a735d22737 100644
--- a/components/script/layout_interface.rs
+++ b/components/script/layout_interface.rs
@@ -14,7 +14,7 @@ use ipc_channel::ipc::{IpcReceiver, IpcSender};
 use libc::uintptr_t;
 use msg::compositor_msg::Epoch;
 use msg::compositor_msg::LayerId;
-use msg::constellation_msg::{ConstellationChan, Failure, PipelineExitType, PipelineId};
+use msg::constellation_msg::{ConstellationChan, Failure, PipelineId};
 use msg::constellation_msg::{WindowSizeData};
 use net_traits::PendingAsyncLoad;
 use net_traits::image_cache_task::ImageCacheTask;
@@ -78,7 +78,7 @@ pub enum Msg {
 
     /// Requests that the layout task immediately shut down. There must be no more nodes left after
     /// this, or layout will crash.
-    ExitNow(PipelineExitType),
+    ExitNow,
 
     /// Get the last epoch counter for this layout task.
     GetCurrentEpoch(IpcSender<Epoch>),
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index ac67e4a5996..508e5c476b9 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -1455,7 +1455,7 @@ impl ScriptTask {
             if chan.send(layout_interface::Msg::PrepareToExit(response_chan)).is_ok() {
                 debug!("shutting down layout for page {:?}", id);
                 response_port.recv().unwrap();
-                chan.send(layout_interface::Msg::ExitNow(exit_type)).ok();
+                chan.send(layout_interface::Msg::ExitNow).ok();
             }
 
             let has_pending_loads = self.incomplete_loads.borrow().len() > 0;
@@ -1970,7 +1970,7 @@ impl Drop for ScriptTask {
 }
 
 /// Shuts down layout for the given page tree.
-fn shut_down_layout(page_tree: &Rc<Page>, exit_type: PipelineExitType) {
+fn shut_down_layout(page_tree: &Rc<Page>, _: PipelineExitType) {
     let mut channels = vec!();
 
     for page in page_tree.iter() {
@@ -1995,7 +1995,7 @@ fn shut_down_layout(page_tree: &Rc<Page>, exit_type: PipelineExitType) {
 
     // Destroy the layout task. If there were node leaks, layout will now crash safely.
     for chan in channels {
-        chan.send(layout_interface::Msg::ExitNow(exit_type)).ok();
+        chan.send(layout_interface::Msg::ExitNow).ok();
     }
 }