browser(webkit): do not hang on close when there is a dialog (#4332)

yury-s · web-flow · commit 890add98fe5f · 2020-11-03T18:58:57.000-08:00
diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER
@@ -1,2 +1,2 @@
-1377
-Changed: yurys@chromium.org Tue 03 Nov 2020 03:59:48 PM PST
+1378
+Changed: yurys@chromium.org Tue Nov  3 18:28:54 PST 2020
diff --git a/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m b/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m
@@ -358,6 +358,7 @@ - (void)quit
 #pragma mark WKUIDelegate
 
 - (void)webViewDidClose:(WKWebView *)webView {
+    [self webView:webView handleJavaScriptDialog:false value:nil];
     for (NSWindow *window in _headlessWindows) {
         if (webView.window != window)
             continue;
diff --git a/browser_patches/webkit/embedder/Playwright/mac/BrowserWindowController.m b/browser_patches/webkit/embedder/Playwright/mac/BrowserWindowController.m
@@ -418,6 +418,7 @@ - (void)windowWillClose:(NSNotification *)notification
 }
 
 - (void)webViewDidClose:(WKWebView *)webView {
+    [self webView:webView handleJavaScriptDialog:false value:nil];
     [self.window close];
 }
 

-Original file line number
+Diff line change
@@ @@ -1,2 +1,2 @@ @@
 -1377
 -Changed: [email protected] Tue 03 Nov 2020 03:59:48 PM PST
 +1378
 +Changed: [email protected] Tue Nov  3 18:28:54 PST 2020
Original file line number	Diff line number	Diff line change
`@@ -418,6 +418,7 @@ - (void)windowWillClose:(NSNotification *)notification`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`- (void)webViewDidClose:(WKWebView *)webView {`
	`421`	`+ [self webView:webView handleJavaScriptDialog:false value:nil];`
`421`	`422`	`[self.window close];`
`422`	`423`	`}`
`423`	`424`