Title: [239647] trunk/Source
Revision
239647
Author
[email protected]
Date
2019-01-04 16:33:57 -0800 (Fri, 04 Jan 2019)

Log Message

Web Inspector: Use save sheet instead of dialog where possible
https://bugs.webkit.org/show_bug.cgi?id=193160
<rdar://problem/37399759>

Patch by Joseph Pecoraro <[email protected]> on 2019-01-04
Reviewed by Devin Rousso.

Source/WebKit:

* UIProcess/mac/RemoteWebInspectorProxyMac.mm:
(WebKit::RemoteWebInspectorProxy::platformSave):
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::platformSave):

Source/WebKitLegacy/mac:

* WebCoreSupport/WebInspectorClient.mm:
(WebInspectorFrontendClient::save):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (239646 => 239647)


--- trunk/Source/WebKit/ChangeLog	2019-01-05 00:28:57 UTC (rev 239646)
+++ trunk/Source/WebKit/ChangeLog	2019-01-05 00:33:57 UTC (rev 239647)
@@ -1,3 +1,16 @@
+2019-01-04  Joseph Pecoraro  <[email protected]>
+
+        Web Inspector: Use save sheet instead of dialog where possible
+        https://bugs.webkit.org/show_bug.cgi?id=193160
+        <rdar://problem/37399759>
+
+        Reviewed by Devin Rousso.
+
+        * UIProcess/mac/RemoteWebInspectorProxyMac.mm:
+        (WebKit::RemoteWebInspectorProxy::platformSave):
+        * UIProcess/mac/WebInspectorProxyMac.mm:
+        (WebKit::WebInspectorProxy::platformSave):
+
 2019-01-04  Jer Noble  <[email protected]>
 
         [WebKitLegacy] Media playback pauses on scroll

Modified: trunk/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm (239646 => 239647)


--- trunk/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm	2019-01-05 00:28:57 UTC (rev 239646)
+++ trunk/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm	2019-01-05 00:33:57 UTC (rev 239647)
@@ -180,8 +180,9 @@
         saveToURL(panel.URL);
     };
 
-    if (m_window)
-        [panel beginSheetModalForWindow:m_window.get() completionHandler:completionHandler];
+    NSWindow *window = m_window ? m_window.get() : [NSApp keyWindow];
+    if (window)
+        [panel beginSheetModalForWindow:window completionHandler:completionHandler];
     else
         completionHandler([panel runModal]);
 }

Modified: trunk/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm (239646 => 239647)


--- trunk/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm	2019-01-05 00:28:57 UTC (rev 239646)
+++ trunk/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm	2019-01-05 00:33:57 UTC (rev 239647)
@@ -494,8 +494,9 @@
         saveToURL(panel.URL);
     };
 
-    if (m_inspectorWindow)
-        [panel beginSheetModalForWindow:m_inspectorWindow.get() completionHandler:completionHandler];
+    NSWindow *window = m_inspectorWindow ? m_inspectorWindow.get() : [NSApp keyWindow];
+    if (window)
+        [panel beginSheetModalForWindow:window completionHandler:completionHandler];
     else
         completionHandler([panel runModal]);
 }

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (239646 => 239647)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2019-01-05 00:28:57 UTC (rev 239646)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2019-01-05 00:33:57 UTC (rev 239647)
@@ -1,3 +1,14 @@
+2019-01-04  Joseph Pecoraro  <[email protected]>
+
+        Web Inspector: Use save sheet instead of dialog where possible
+        https://bugs.webkit.org/show_bug.cgi?id=193160
+        <rdar://problem/37399759>
+
+        Reviewed by Devin Rousso.
+
+        * WebCoreSupport/WebInspectorClient.mm:
+        (WebInspectorFrontendClient::save):
+
 2019-01-04  Wenson Hsieh  <[email protected]>
 
         [Cocoa] Merge WebEditCommandProxy::nameForEditAction and undoNameForEditAction into a single function

Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm (239646 => 239647)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm	2019-01-05 00:28:57 UTC (rev 239646)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm	2019-01-05 00:33:57 UTC (rev 239647)
@@ -374,8 +374,9 @@
     };
 
     NSWindow *frontendWindow = [[m_frontendWindowController frontendWebView] window];
-    if (frontendWindow)
-        [panel beginSheetModalForWindow:frontendWindow completionHandler:completionHandler];
+    NSWindow *window = frontendWindow ? frontendWindow : [NSApp keyWindow];
+    if (window)
+        [panel beginSheetModalForWindow:window completionHandler:completionHandler];
     else
         completionHandler([panel runModal]);
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to