Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #29424 - jdm:macos-shutdown-crash, r=jdm

Browse source 
Ensure winit windows are cleaned up before TLS disappears.

Since the winit update, closing Servo on macOS can lead to a crash. This is because winit panics while trying to clean up the window, since it requires the TLS to be available. Right now this code doesn't run until Servo's TLS is being destroyed. There's no reason to use a thread local value to store the window information, however, and moving it into the App object avoids the panic.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because we don't run non-headless tests on macOS.
This commit is contained in:
bors-servo 2023-02-27 16:11:58 +01:00 • committed by GitHub
commit 3b807fc594
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

51
ports/winit/app.rs
View file

@ -23,15 +23,12 @@ use std::mem;
use std::rc::Rc;
use webxr::glwindow::GlWindowDiscovery;
thread_local! {
pub static WINDOWS: RefCell<HashMap<WindowId, Rc<dyn WindowPortsMethods>>> = RefCell::new(HashMap::new());
}
pub struct App {
servo: Option<Servo<dyn WindowPortsMethods>>,
browser: RefCell<Browser<dyn WindowPortsMethods>>,
event_queue: RefCell<Vec<WindowEvent>>,
suspended: Cell<bool>,
windows: HashMap<WindowId, Rc<dyn WindowPortsMethods>>,
}
impl App {
@ -62,6 +59,7 @@ impl App {
browser: RefCell::new(browser),
servo: None,
suspended: Cell::new(false),
windows: HashMap::new(),
};
let ev_waker = events_loop.create_event_loop_waker();
@ -105,7 +103,7 @@ impl App {
servo.handle_events(vec![WindowEvent::NewBrowser(get_default_url(), servo_data.browser_id)]);
servo.setup_logging();
register_window(window.clone());
app.windows.insert(window.id(), window.clone());
app.servo = Some(servo);
}
@ -118,12 +116,7 @@ impl App {
// Handle the event
app.winit_event_to_servo_event(e);
let animating = WINDOWS.with(|windows| {
windows
.borrow()
.iter()
.any(|(_, window)| window.is_animating())
});
let animating = app.is_animating();
// Block until the window gets an event
if !animating || app.suspended.get() {
@ -140,6 +133,10 @@ impl App {
});
}
fn is_animating(&self) -> bool {
self.windows.iter().any(|(_, window)| window.is_animating())
}
fn get_events(&self) -> Vec<WindowEvent> {
mem::replace(&mut *self.event_queue.borrow_mut(), Vec::new())
}
@ -168,16 +165,14 @@ impl App {
winit::event::Event::WindowEvent {
window_id, event, ..
} => {
return WINDOWS.with(|windows| {
match windows.borrow().get(&window_id) {
None => {
warn!("Got an event from unknown window");
},
Some(window) => {
window.winit_event_to_servo_event(event);
},
}
});
match self.windows.get(&window_id) {
None => {
warn!("Got an event from unknown window");
},
Some(window) => {
window.winit_event_to_servo_event(event);
},
}
},
winit::event::Event::LoopDestroyed |
@ -198,11 +193,9 @@ impl App {
// will send a key event to the servo window.
let mut app_events = self.get_events();
WINDOWS.with(|windows| {
for (_win_id, window) in &*windows.borrow() {
app_events.extend(window.get_events());
}
});
for (_win_id, window) in &self.windows {
app_events.extend(window.get_events());
}
browser.handle_window_events(app_events);
@ -240,9 +233,3 @@ fn get_default_url() -> ServoUrl {
cmdline_url.or(pref_url).or(blank_url).unwrap()
}
pub fn register_window(window: Rc<dyn WindowPortsMethods>) {
WINDOWS.with(|w| {
w.borrow_mut().insert(window.id(), window);
});
}