Update winit.

servo · Jan 15, 2024 · fb92ab5 · fb92ab5
1 parent 8ab0d46
commit fb92ab5
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 23 deletions.
diff --git a/surfman/Cargo.toml b/surfman/Cargo.toml
@@ -38,8 +38,8 @@ libc = "0.2"
 log = "0.4"
 sparkle = { version = "0.1", optional = true }
 osmesa-sys = { version = "0.1", optional = true }
-winit = { version = "0.28.1", optional = true }
-raw-window-handle = { version = "0.5", optional = true }
+winit = { version = "0.29.3", optional = true }
+raw-window-handle = { version = "0.6", optional = true }
 
 [dev-dependencies]
 clap = "2"

diff --git a/surfman/src/platform/macos/cgl/connection.rs b/surfman/src/platform/macos/cgl/connection.rs
@@ -147,10 +147,14 @@ impl Connection {
         use raw_window_handle::RawWindowHandle::AppKit;
 
         match raw_handle {
-            AppKit(handle) => Ok(NativeWidget {
-                view: NSView(unsafe { msg_send![handle.ns_view as id, retain] }),
-                opaque: unsafe { msg_send![handle.ns_window as id, isOpaque] },
-            }),
+            AppKit(handle) => {
+                let view = NSView(unsafe { msg_send![handle.ns_view.as_ptr() as id, retain] });
+                let window: id = unsafe { msg_send![view.0, window] };
+                Ok(NativeWidget {
+                    view: view,
+                    opaque: unsafe { msg_send![window, isOpaque] },
+                })
+            }
             _ => Err(Error::IncompatibleNativeWidget),
         }
     }

diff --git a/surfman/src/platform/macos/system/connection.rs b/surfman/src/platform/macos/system/connection.rs
@@ -22,10 +22,10 @@ use euclid::default::Size2D;
 use std::os::raw::c_void;
 use std::str::FromStr;
 
-#[cfg(feature = "sm-winit")]
-use winit::platform::macos::WindowExtMacOS;
 #[cfg(feature = "sm-winit")]
 use winit::window::Window;
+#[cfg(feature = "sm-winit")]
+use raw_window_handle::HasWindowHandle;
 
 /// A no-op connection.
 ///
@@ -145,16 +145,25 @@ impl Connection {
         &self,
         window: &Window,
     ) -> Result<NativeWidget, Error> {
-        let ns_view = window.ns_view() as id;
-        let ns_window = window.ns_window() as id;
-        if ns_view.is_null() {
-            return Err(Error::IncompatibleNativeWidget);
-        }
-        unsafe {
-            Ok(NativeWidget {
-                view: NSView(msg_send![ns_view, retain]),
-                opaque: msg_send![ns_window as id, isOpaque],
-            })
+        use raw_window_handle::RawWindowHandle::AppKit;
+
+        let handle = window.window_handle().map_err(|_| Error::IncompatibleNativeWidget)?;
+        let raw_handle = handle.as_raw();
+        match raw_handle {
+            AppKit(handle) => {
+                let ns_view = handle.ns_view.as_ptr() as id;
+                if ns_view.is_null() {
+                    return Err(Error::IncompatibleNativeWidget);
+                }
+                let ns_window: id = unsafe { msg_send![ns_view, window] };
+                unsafe {
+                    Ok(NativeWidget {
+                        view: NSView(msg_send![ns_view, retain]),
+                        opaque: msg_send![ns_window, isOpaque],
+                    })
+                }
+            }
+            _ => Err(Error::IncompatibleNativeWidget),
         }
     }
 
@@ -180,10 +189,14 @@ impl Connection {
         use raw_window_handle::RawWindowHandle::AppKit;
 
         match raw_handle {
-            AppKit(handle) => Ok(NativeWidget {
-                view: NSView(unsafe { msg_send![handle.ns_view as id, retain] }),
-                opaque: unsafe { msg_send![handle.ns_window as id, isOpaque] },
-            }),
+            AppKit(handle) => {
+                let view = NSView(unsafe { msg_send![handle.ns_view.as_ptr() as id, retain] }); 
+                let window: id = unsafe { msg_send![view.0, window] };
+                Ok(NativeWidget {
+                    view: view,
+                    opaque: unsafe { msg_send![window, isOpaque] },
+                })
+            }
             _ => Err(Error::IncompatibleNativeWidget),
         }
     }

diff --git a/surfman/src/platform/macos/system/surface.rs b/surfman/src/platform/macos/system/surface.rs
@@ -473,7 +473,7 @@ impl Drop for ViewInfo {
             self.display_link.stop();
 
             // Drop the reference that the callback was holding onto.
-            mem::transmute_copy::<Arc<VblankCond>, Arc<VblankCond>>(&self.next_vblank);
+            let _ = mem::transmute_copy::<Arc<VblankCond>, Arc<VblankCond>>(&self.next_vblank);
         }
     }
 }