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

Remove the unused PipelineExitType field from ChromeToPaintMsg::Exit.

Browse source
This commit is contained in:
Ms2ger 2015-11-05 16:31:37 +01:00
parent ffffc5f065
commit f37b8e9f4d
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/compositing/pipeline.rs
View file

@ -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();

6
components/gfx/paint_task.rs
View file

@ -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<C> {
@ -391,7 +391,7 @@ impl<C> PaintTask<C> 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);