Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove the unused PipelineExitType from LayoutToPaintMsg::Exit.

Browse source
This commit is contained in:
Ms2ger 2015-11-05 15:46:44 +01:00
parent a01fd7732d
commit 995d022bb9
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/gfx/paint_task.rs
View file

@ -197,7 +197,7 @@ pub enum Msg {
pub enum LayoutToPaintMsg { pub enum LayoutToPaintMsg {
PaintInit(Epoch, PaintLayer), PaintInit(Epoch, PaintLayer),
CanvasLayer(LayerId, IpcSender<CanvasMsg>), CanvasLayer(LayerId, IpcSender<CanvasMsg>),
Exit(IpcSender<()>, PipelineExitType), Exit(IpcSender<()>),
} }
pub enum ChromeToPaintMsg { pub enum ChromeToPaintMsg {
@ -382,7 +382,7 @@ impl<C> PaintTask<C> where C: PaintListener + Send + 'static {
// FIXME(njn): should eventually measure the paint task. // FIXME(njn): should eventually measure the paint task.
channel.send(Vec::new()) channel.send(Vec::new())
} }
Msg::FromLayout(LayoutToPaintMsg::Exit(ref response_channel, _)) => { Msg::FromLayout(LayoutToPaintMsg::Exit(ref response_channel)) => {
// Ask the compositor to remove any layers it is holding for this paint task. // Ask the compositor to remove any layers it is holding for this paint task.
// FIXME(mrobinson): This can probably move back to the constellation now. // FIXME(mrobinson): This can probably move back to the constellation now.
self.compositor.notify_paint_task_exiting(self.id); self.compositor.notify_paint_task_exiting(self.id);

4
components/layout/layout_task.rs
View file

@ -730,7 +730,7 @@ impl LayoutTask {
/// 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>>,
exit_type: PipelineExitType) { _: 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 {
@ -740,7 +740,7 @@ impl LayoutTask {
} }
let (response_chan, response_port) = ipc::channel().unwrap(); let (response_chan, response_port) = ipc::channel().unwrap();
self.paint_chan.send(LayoutToPaintMsg::Exit(response_chan, exit_type)).unwrap(); self.paint_chan.send(LayoutToPaintMsg::Exit(response_chan)).unwrap();
response_port.recv().unwrap() response_port.recv().unwrap()
} }