Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove the unused PipelineExitType argument to LayoutTask::exit_now.

Browse source
This commit is contained in:
Ms2ger 2015-11-05 16:09:39 +01:00
parent 995d022bb9
commit 5cd250602f
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/layout/layout_task.rs
View file

@ -40,7 +40,7 @@ use layout_traits::LayoutTaskFactory;
use log; use log;
use msg::compositor_msg::{Epoch, LayerId, ScrollPolicy}; use msg::compositor_msg::{Epoch, LayerId, ScrollPolicy};
use msg::constellation_msg::Msg as ConstellationMsg; 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::image_cache_task::{ImageCacheChan, ImageCacheResult, ImageCacheTask};
use net_traits::{PendingAsyncLoad, load_bytes_iter}; use net_traits::{PendingAsyncLoad, load_bytes_iter};
use opaque_node::OpaqueNodeMethods; use opaque_node::OpaqueNodeMethods;
@ -631,9 +631,9 @@ impl LayoutTask {
self.prepare_to_exit(response_chan, possibly_locked_rw_data); self.prepare_to_exit(response_chan, possibly_locked_rw_data);
return false return false
}, },
Msg::ExitNow(exit_type) => { Msg::ExitNow(_) => {
debug!("layout: ExitNow received"); debug!("layout: ExitNow received");
self.exit_now(possibly_locked_rw_data, exit_type); self.exit_now(possibly_locked_rw_data);
return false return false
} }
} }
@ -711,9 +711,9 @@ impl LayoutTask {
self.handle_reap_layout_data(dead_layout_data) self.handle_reap_layout_data(dead_layout_data)
} }
} }
Msg::ExitNow(exit_type) => { Msg::ExitNow(_) => {
debug!("layout task is exiting..."); debug!("layout task is exiting...");
self.exit_now(possibly_locked_rw_data, exit_type); self.exit_now(possibly_locked_rw_data);
break break
} }
Msg::CollectReports(_) => { 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) /// Shuts down the layout task now. If there are any DOM nodes left, layout will now (safely)
/// crash. /// crash.
fn exit_now<'a>(&'a self, fn exit_now<'a>(&'a self,
possibly_locked_rw_data: &mut Option<MutexGuard<'a, LayoutTaskData>>, possibly_locked_rw_data: &mut Option<MutexGuard<'a, LayoutTaskData>>) {
_: PipelineExitType) {
{ {
let mut rw_data = self.lock_rw_data(possibly_locked_rw_data); let mut rw_data = self.lock_rw_data(possibly_locked_rw_data);
if let Some(ref mut traversal) = (&mut *rw_data).parallel_traversal { if let Some(ref mut traversal) = (&mut *rw_data).parallel_traversal {