language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-09-30 13:51:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

wasm32: Fix reentrancy issues with invoke_from_event_loop

Browse source 
If it's called on top of the an event processed on the event loop,
it might be that GLOBAL_PROXY is already borrowed further down
the stack.
This commit is contained in:
Jocelyn Turcotte 2021-11-13 23:49:22 +01:00 • committed by Simon Hausmann
parent d8988cae6c
commit 93c28d12db
1 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sixtyfps_runtime/rendering_backends/gl/lib.rs
View file

@ -1226,11 +1226,31 @@ impl sixtyfps_corelib::backend::Backend for Backend {
fn post_event(&'static self, event: Box<dyn FnOnce() + Send>) { fn post_event(&'static self, event: Box<dyn FnOnce() + Send>) {
let e = crate::event_loop::CustomEvent::UserEvent(event); let e = crate::event_loop::CustomEvent::UserEvent(event);
#[cfg(not(target_arch = "wasm32"))] #[cfg(not(target_arch = "wasm32"))]
crate::event_loop::GLOBAL_PROXY.get_or_init(Default::default).lock().unwrap().send_event(e); crate::event_loop::GLOBAL_PROXY.get_or_init(Default::default).lock().unwrap().send_event(e);
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")] {
crate::event_loop::GLOBAL_PROXY.with(|global_proxy| { use wasm_bindgen::closure::Closure;
global_proxy.borrow_mut().get_or_insert_with(Default::default).send_event(e) use wasm_bindgen::JsCast;
});
let window = web_sys::window().expect("Failed to obtain window");
let send_event = || {
crate::event_loop::GLOBAL_PROXY.with(|global_proxy| {
global_proxy.borrow_mut().get_or_insert_with(Default::default).send_event(e)
});
};
// Calling send_event is usually done by winit at the bottom of the stack,
// in event handlers, and thus winit might decide to process the event
// immediately within that stack.
// To prevent re-entrancy issues that might happen by getting the application
// event processed on top of the current stack, mimic the event handling
// use case and make sure that our event is processed on top of a clean stack.
window
.set_timeout_with_callback_and_timeout_and_arguments_0(
&Closure::once_into_js(send_event).as_ref().unchecked_ref(),
0,
)
.expect("Failed to set timeout");
}
} }
fn image_size(&'static self, image: &Image) -> Size { fn image_size(&'static self, image: &Image) -> Size {