From 95552c401964d079912b79cc8bc1275e4ab11cbe Mon Sep 17 00:00:00 2001
From: Roman Zaynetdinov <roman.zaynetdinov@lekane.com>
Date: Sun, 25 Dec 2016 13:05:00 +0200
Subject: [PATCH] Remove unused boolean argument from ContellationMsg's
 GetPipeline

---
 components/constellation/constellation.rs | 6 +++---
 components/script_traits/lib.rs           | 2 +-
 components/webdriver_server/lib.rs        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
index d2e0dc421cd..8201b23382b 100644
--- a/components/constellation/constellation.rs
+++ b/components/constellation/constellation.rs
@@ -1920,15 +1920,15 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
     }
 
     fn handle_get_pipeline(&mut self, frame_id: Option<FrameId>,
-                           resp_chan: IpcSender<Option<(PipelineId, bool)>>) {
+                           resp_chan: IpcSender<Option<PipelineId>>) {
         let frame_id = frame_id.unwrap_or(self.root_frame_id);
         let current_pipeline_id = self.frames.get(&frame_id)
             .map(|frame| frame.current.pipeline_id);
         let current_pipeline_id_loaded = current_pipeline_id
-            .map(|id| (id, true));
+            .map(|id| id);
         let pipeline_id_loaded = self.pending_frames.iter().rev()
             .find(|x| x.old_pipeline_id == current_pipeline_id)
-            .map(|x| (x.new_pipeline_id, false))
+            .map(|x| x.new_pipeline_id)
             .or(current_pipeline_id_loaded);
         if let Err(e) = resp_chan.send(pipeline_id_loaded) {
             warn!("Failed get_pipeline response ({}).", e);
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs
index 0494f44c70d..56d4406f1ce 100644
--- a/components/script_traits/lib.rs
+++ b/components/script_traits/lib.rs
@@ -686,7 +686,7 @@ pub enum ConstellationMsg {
     /// Request that the constellation send the current pipeline id for the provided frame
     /// id, or for the root frame if this is None, over a provided channel.
     /// Also returns a boolean saying whether the document has finished loading or not.
-    GetPipeline(Option<FrameId>, IpcSender<Option<(PipelineId, bool)>>),
+    GetPipeline(Option<FrameId>, IpcSender<Option<PipelineId>>),
     /// Requests that the constellation inform the compositor of the title of the pipeline
     /// immediately.
     GetPipelineTitle(PipelineId),
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
index 9994f0b751e..7d723813f48 100644
--- a/components/webdriver_server/lib.rs
+++ b/components/webdriver_server/lib.rs
@@ -260,7 +260,7 @@ impl Handler {
             let msg = ConstellationMsg::GetPipeline(frame_id, sender.clone());
             self.constellation_chan.send(msg).unwrap();
             // Wait until the document is ready before returning the pipeline id.
-            if let Some((x, true)) = receiver.recv().unwrap() {
+            if let Some(x) = receiver.recv().unwrap() {
                 return Ok(x);
             }
             thread::sleep(Duration::from_millis(interval));