aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/layout_task.rs
diff options
context:
space:
mode:
authorMs2ger <Ms2ger@gmail.com>2015-11-05 16:09:39 +0100
committerMs2ger <Ms2ger@gmail.com>2015-11-05 16:09:39 +0100
commit5cd250602ffa43d87c8131456be089e749887a3a (patch)
tree2f6df8ed2222a580d36a9b279cc50d083448a7bb /components/layout/layout_task.rs
parent995d022bb9e3b381f36f37995f16562dd6c5ddf0 (diff)
downloadservo-5cd250602ffa43d87c8131456be089e749887a3a.tar.gz
servo-5cd250602ffa43d87c8131456be089e749887a3a.zip
Remove the unused PipelineExitType argument to LayoutTask::exit_now.
Diffstat (limited to 'components/layout/layout_task.rs')
-rw-r--r--components/layout/layout_task.rs13
1 files changed, 6 insertions, 7 deletions
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index 8000c431734..1a5fea87482 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -40,7 +40,7 @@ use layout_traits::LayoutTaskFactory;
use log;
use msg::compositor_msg::{Epoch, LayerId, ScrollPolicy};
use msg::constellation_msg::Msg as ConstellationMsg;
-use msg::constellation_msg::{ConstellationChan, Failure, PipelineExitType, PipelineId};
+use msg::constellation_msg::{ConstellationChan, Failure, PipelineId};
use net_traits::image_cache_task::{ImageCacheChan, ImageCacheResult, ImageCacheTask};
use net_traits::{PendingAsyncLoad, load_bytes_iter};
use opaque_node::OpaqueNodeMethods;
@@ -631,9 +631,9 @@ impl LayoutTask {
self.prepare_to_exit(response_chan, possibly_locked_rw_data);
return false
},
- Msg::ExitNow(exit_type) => {
+ Msg::ExitNow(_) => {
debug!("layout: ExitNow received");
- self.exit_now(possibly_locked_rw_data, exit_type);
+ self.exit_now(possibly_locked_rw_data);
return false
}
}
@@ -711,9 +711,9 @@ impl LayoutTask {
self.handle_reap_layout_data(dead_layout_data)
}
}
- Msg::ExitNow(exit_type) => {
+ Msg::ExitNow(_) => {
debug!("layout task is exiting...");
- self.exit_now(possibly_locked_rw_data, exit_type);
+ self.exit_now(possibly_locked_rw_data);
break
}
Msg::CollectReports(_) => {
@@ -729,8 +729,7 @@ impl LayoutTask {
/// Shuts down the layout task now. If there are any DOM nodes left, layout will now (safely)
/// crash.
fn exit_now<'a>(&'a self,
- possibly_locked_rw_data: &mut Option<MutexGuard<'a, LayoutTaskData>>,
- _: PipelineExitType) {
+ possibly_locked_rw_data: &mut Option<MutexGuard<'a, LayoutTaskData>>) {
{
let mut rw_data = self.lock_rw_data(possibly_locked_rw_data);
if let Some(ref mut traversal) = (&mut *rw_data).parallel_traversal {