diff --git a/components/compositing/pipeline.rs b/components/compositing/pipeline.rs index 75d166f5f76..2bc78c22ed2 100644 --- a/components/compositing/pipeline.rs +++ b/components/compositing/pipeline.rs @@ -276,8 +276,7 @@ impl Pipeline { pub fn force_exit(&self) { let _ = self.script_chan.send(ConstellationControlMsg::ExitPipeline(self.id)).unwrap(); - let _ = self.chrome_to_paint_chan.send(ChromeToPaintMsg::Exit( - PipelineExitType::PipelineOnly)); + let _ = self.chrome_to_paint_chan.send(ChromeToPaintMsg::Exit); let LayoutControlChan(ref layout_channel) = self.layout_chan; let _ = layout_channel.send( LayoutControlMsg::ExitNow(PipelineExitType::PipelineOnly)).unwrap(); diff --git a/components/gfx/paint_task.rs b/components/gfx/paint_task.rs index f88d0099559..23da15a3ee1 100644 --- a/components/gfx/paint_task.rs +++ b/components/gfx/paint_task.rs @@ -22,7 +22,7 @@ use layers::platform::surface::{NativeDisplay, NativeSurface}; use msg::compositor_msg::{Epoch, FrameTreeId, LayerId, LayerKind, LayerProperties}; use msg::compositor_msg::{PaintListener, ScrollPolicy}; use msg::constellation_msg::Msg as ConstellationMsg; -use msg::constellation_msg::{ConstellationChan, Failure, PipelineExitType, PipelineId}; +use msg::constellation_msg::{ConstellationChan, Failure, PipelineId}; use paint_context::PaintContext; use profile_traits::mem::{self, ReportsChan}; use profile_traits::time::{self, profile}; @@ -205,7 +205,7 @@ pub enum ChromeToPaintMsg { PaintPermissionGranted, PaintPermissionRevoked, CollectReports(ReportsChan), - Exit(PipelineExitType), + Exit, } pub struct PaintTask { @@ -391,7 +391,7 @@ impl PaintTask where C: PaintListener + Send + 'static { let _ = response_channel.send(()); break; } - Msg::FromChrome(ChromeToPaintMsg::Exit(_)) => { + Msg::FromChrome(ChromeToPaintMsg::Exit) => { // 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. self.compositor.notify_paint_task_exiting(self.id);