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

Ensure winit windows are cleaned up before TLS disappears.

Browse source
This commit is contained in:
Josh Matthews 2023-02-26 19:17:31 -05:00
parent 393902fdc1
commit a99dd55584
1 changed files with 19 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

33
ports/winit/app.rs
View file

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