mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +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
|
@ -648,8 +648,13 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF>
|
|||
}
|
||||
// Update pipeline url after redirections
|
||||
Request::Script(FromScriptMsg::SetFinalUrl(pipeline_id, final_url)) => {
|
||||
debug!("constellation got set final url message");
|
||||
self.mut_pipeline(pipeline_id).url = final_url;
|
||||
// The script may have finished loading after we already started shutting down.
|
||||
if let Some(ref mut pipeline) = self.pipelines.get_mut(&pipeline_id) {
|
||||
debug!("constellation got set final url message");
|
||||
pipeline.url = final_url;
|
||||
} else {
|
||||
debug!("constellation got set final url message for dead pipeline");
|
||||
}
|
||||
}
|
||||
Request::Script(FromScriptMsg::MozBrowserEvent(pipeline_id,
|
||||
subpage_id,
|
||||
|
@ -693,9 +698,12 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF>
|
|||
}
|
||||
}
|
||||
}
|
||||
Request::Script(FromScriptMsg::RemoveIFrame(pipeline_id)) => {
|
||||
Request::Script(FromScriptMsg::RemoveIFrame(pipeline_id, sender)) => {
|
||||
debug!("constellation got remove iframe message");
|
||||
self.handle_remove_iframe_msg(pipeline_id);
|
||||
if let Some(sender) = sender {
|
||||
sender.send(()).unwrap();
|
||||
}
|
||||
}
|
||||
Request::Script(FromScriptMsg::NewFavicon(url)) => {
|
||||
debug!("constellation got new favicon message");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue