mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Auto merge of #8641 - notriddle:no_headless, r=glennw
No more headless compositor. Just the normal one. Fixes #8573 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8641) <!-- Reviewable:end -->
This commit is contained in:
commit
aac2da75f4
26 changed files with 121 additions and 474 deletions
|
@ -342,7 +342,7 @@ pub enum Msg {
|
|||
#[derive(Deserialize, Serialize)]
|
||||
pub enum LayoutToPaintMsg {
|
||||
PaintInit(Epoch, Arc<DisplayList>),
|
||||
Exit(IpcSender<()>),
|
||||
Exit,
|
||||
}
|
||||
|
||||
pub enum ChromeToPaintMsg {
|
||||
|
@ -505,21 +505,20 @@ impl<C> PaintThread<C> where C: PaintListener + Send + 'static {
|
|||
// FIXME(njn): should eventually measure the paint thread.
|
||||
channel.send(Vec::new())
|
||||
}
|
||||
Msg::FromLayout(LayoutToPaintMsg::Exit(ref response_channel)) => {
|
||||
Msg::FromLayout(LayoutToPaintMsg::Exit) => {
|
||||
// Ask the compositor to remove any layers it is holding for this paint thread.
|
||||
// FIXME(mrobinson): This can probably move back to the constellation now.
|
||||
debug!("PaintThread: Exiting.");
|
||||
self.compositor.notify_paint_thread_exiting(self.id);
|
||||
|
||||
debug!("PaintThread: Exiting.");
|
||||
let _ = response_channel.send(());
|
||||
break;
|
||||
}
|
||||
Msg::FromChrome(ChromeToPaintMsg::Exit) => {
|
||||
// Ask the compositor to remove any layers it is holding for this paint thread.
|
||||
// FIXME(mrobinson): This can probably move back to the constellation now.
|
||||
debug!("PaintThread: Exiting.");
|
||||
self.compositor.notify_paint_thread_exiting(self.id);
|
||||
|
||||
debug!("PaintThread: Exiting.");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue