Attachment 358366 Details for Bug 193160 – [PATCH] Proposed Fix

[patch] [PATCH] Proposed Fix

save-sheet-1.patch (text/plain), 3.83 KB, created by Joseph Pecoraro on 2019-01-04 14:16:24 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Pecoraro

Created: 2019-01-04 14:16:24 PST

Size: 3.83 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index a4835ba42b6..4e96899a46e 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-01-04  Joseph Pecoraro  <pecoraro@apple.com>
>+
>+        Web Inspector: Use save sheet instead of dialog where possible
>+        https://bugs.webkit.org/show_bug.cgi?id=193160
>+        <rdar://problem/37399759>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/mac/RemoteWebInspectorProxyMac.mm:
>+        (WebKit::RemoteWebInspectorProxy::platformSave):
>+        * UIProcess/mac/WebInspectorProxyMac.mm:
>+        (WebKit::WebInspectorProxy::platformSave):
>+
> 2019-01-03  Brent Fulgham  <bfulgham@apple.com>
> 
>         Remove logic handling DNT header during redirects
>diff --git a/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm b/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm
>index ae9f25bcfa6..caee26bdc22 100644
>--- a/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm
>+++ b/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm
>@@ -180,8 +180,9 @@ void RemoteWebInspectorProxy::platformSave(const String& suggestedURL, const Str
>         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]);
> }
>diff --git a/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm b/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm
>index 1210067ff0d..86ef9453b52 100644
>--- a/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm
>+++ b/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm
>@@ -494,8 +494,9 @@ void WebInspectorProxy::platformSave(const String& suggestedURL, const String& c
>         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]);
> }
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 1372daf11ad..d04a1c3283c 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-04  Joseph Pecoraro  <pecoraro@apple.com>
>+
>+        Web Inspector: Use save sheet instead of dialog where possible
>+        https://bugs.webkit.org/show_bug.cgi?id=193160
>+        <rdar://problem/37399759>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCoreSupport/WebInspectorClient.mm:
>+        (WebInspectorFrontendClient::save):
>+
> 2019-01-02  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Add support for using the current text selection as the find string on iOS
>diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm b/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm
>index dc6c3b841dc..28951a48c7d 100644
>--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm
>+++ b/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm
>@@ -374,8 +374,9 @@ void WebInspectorFrontendClient::save(const String& suggestedURL, const String&
>     };
> 
>     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]);
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 193160: 358366