Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
gpui_macos: Release the accessibility adapter when a window is dropped (#64143)
xiaofei0eda7703f6c8
diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rsindex 9a6c503a528..4156294e5cb 100644--- a/crates/gpui_macos/src/window.rs+++ b/crates/gpui_macos/src/window.rs@@ -1375,6 +1375,15 @@ impl MacWindow {impl Drop for MacWindow {fn drop(&mut self) {let mut this = self.0.lock();+ // `accesskit_macos::SubclassingAdapter::for_window` strong-retains the+ // window's content view, and that content view keeps the `GPUIView` it+ // hosts alive. Together with the `Arc<Mutex<MacWindowState>>` parked in+ // both views' `windowState` ivar, that forms+ // `MacWindowState -> adapter -> content view -> GPUIView -> MacWindowState`,+ // a cycle the delegate/`frame_source` teardown below cannot break. Drop+ // the adapter here so the native view, its `CAMetalLayer` and the+ // renderer's command queue are actually released with the window.+ drop(this.accesskit_adapter.take());this.renderer.destroy();let window = this.native_window;let sheet_parent = this.sheet_parent.take();