Remove unused RwData arguments from LayoutTask::exit_now and LayoutTask::prepare_to_exit.

This commit is contained in:
Ms2ger 2015-11-06 13:38:28 +01:00
parent dcea03c2b4
commit be178c0e5e

View file

@ -636,12 +636,12 @@ impl LayoutTask {
self.create_layout_task(info)
}
Msg::PrepareToExit(response_chan) => {
self.prepare_to_exit(response_chan, possibly_locked_rw_data);
self.prepare_to_exit(response_chan);
return false
},
Msg::ExitNow => {
debug!("layout: ExitNow received");
self.exit_now(possibly_locked_rw_data);
self.exit_now();
return false
}
}
@ -708,9 +708,7 @@ impl LayoutTask {
/// Enters a quiescent state in which no new messages will be processed until an `ExitNow` is
/// received. A pong is immediately sent on the given response channel.
fn prepare_to_exit<'a, 'b>(&mut self,
response_chan: Sender<()>,
possibly_locked_rw_data: &mut RwData<'a, 'b>) {
fn prepare_to_exit(&mut self, response_chan: Sender<()>) {
response_chan.send(()).unwrap();
loop {
match self.port.recv().unwrap() {
@ -721,7 +719,7 @@ impl LayoutTask {
}
Msg::ExitNow => {
debug!("layout task is exiting...");
self.exit_now(possibly_locked_rw_data);
self.exit_now();
break
}
Msg::CollectReports(_) => {
@ -736,7 +734,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, 'b>(&mut self, _: &mut RwData<'a, 'b>) {
fn exit_now<'a, 'b>(&mut self) {
if let Some(ref mut traversal) = self.parallel_traversal {
traversal.shutdown()
}