Web Inspector: Undocked window should remain in the same window set as the inspected content's window when using Stage Manager

patrickangle · patrickangle · commit c0b73633fcd7 · 2023-01-09T10:25:51.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=250218 rdar://94829409 Reviewed by Wenson Hsieh. Adopt proper API for making a window an "auxiliary" window, instead of the previous workaround to get the behavior. * Source/WTF/wtf/PlatformHave.h: * Source/WebKit/UIProcess/Inspector/mac/WebInspectorUIProxyMac.mm: (WebKit::WebInspectorUIProxy::createFrontendWindow): * Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm: (-[WebInspectorWindowController window]): Canonical link: https://commits.webkit.org/258672@main
diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h
@@ -1400,3 +1400,7 @@
 #if (PLATFORM(IOS) || PLATFORM(WATCHOS) || PLATFORM(APPLETV))
 #define HAVE_MACH_BOOTSTRAP_EXTENSION 1
 #endif
+
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000)
+#define HAVE_STAGE_MANAGER_NS_WINDOW_COLLECTION_BEHAVIORS 1
+#endif
diff --git a/Source/WebKit/UIProcess/Inspector/mac/WebInspectorUIProxyMac.mm b/Source/WebKit/UIProcess/Inspector/mac/WebInspectorUIProxyMac.mm
@@ -372,10 +372,9 @@ - (IBAction)_popUpButtonAction:(id)sender
     [window setMinFullScreenContentSize:NSMakeSize(minimumFullScreenWidth, minimumWindowHeight)];
     [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenAllowsTiling)];
 
-    // FIXME: <rdar://94829409> Replace Stage Manager auxiliary window workaround.
-    [window setToolbar:[NSToolbar new]];
-    [[window toolbar] setVisible:NO];
-    [window setToolbarStyle:NSWindowToolbarStylePreference];
+#if HAVE(STAGE_MANAGER_NS_WINDOW_COLLECTION_BEHAVIORS)
+    [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorAuxiliary)];
+#endif
 
     [window setTitlebarAppearsTransparent:YES];
 
diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm b/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm
@@ -558,10 +558,9 @@ - (NSWindow *)window
     [window setMinFullScreenContentSize:NSMakeSize(minimumFullScreenWidth, minimumWindowHeight)];
     [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenAllowsTiling)];
 
-    // FIXME: <rdar://94829409> Replace Stage Manager auxiliary window workaround.
-    [window setToolbar:[NSToolbar new]];
-    [[window toolbar] setVisible:NO];
-    [window setToolbarStyle:NSWindowToolbarStylePreference];
+#if HAVE(STAGE_MANAGER_NS_WINDOW_COLLECTION_BEHAVIORS)
+    [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorAuxiliary)];
+#endif
     
     [window setTitlebarAppearsTransparent:YES];
 
