From 6b57f67bdad09c88771604a3ee445e8984a17f32 Mon Sep 17 00:00:00 2001
From: Pavel Feldman <pavel.feldman@gmail.com>
Date: Wed, 11 Dec 2019 20:18:42 -0800
Subject: [PATCH] fix(webkit): implement headless popups (#220)

---
 browser_patches/webkit/BUILD_NUMBER           |  2 +-
 browser_patches/webkit/patches/bootstrap.diff | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER
index 327f63bda8..1f3d8a7a1f 100644
--- a/browser_patches/webkit/BUILD_NUMBER
+++ b/browser_patches/webkit/BUILD_NUMBER
@@ -1 +1 @@
-1027
+1028
diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff
index 09190be927..baa4120d46 100644
--- a/browser_patches/webkit/patches/bootstrap.diff
+++ b/browser_patches/webkit/patches/bootstrap.diff
@@ -7265,7 +7265,7 @@ index 45ef1a6424e..6e015fcb8bc 100644
  
      IBOutlet NSMenuItem *_newWebKit1WindowItem;
 diff --git a/Tools/MiniBrowser/mac/AppDelegate.m b/Tools/MiniBrowser/mac/AppDelegate.m
-index b6af4ef724f..365582e402d 100644
+index b6af4ef724f..7a3c798da52 100644
 --- a/Tools/MiniBrowser/mac/AppDelegate.m
 +++ b/Tools/MiniBrowser/mac/AppDelegate.m
 @@ -33,7 +33,9 @@
@@ -7428,7 +7428,7 @@ index b6af4ef724f..365582e402d 100644
      [_extensionManagerWindowController showWindow:sender];
  }
  
-@@ -345,4 +399,135 @@ - (IBAction)clearDefaultStoreWebsiteData:(id)sender
+@@ -345,4 +399,147 @@ - (IBAction)clearDefaultStoreWebsiteData:(id)sender
      }];
  }
  
@@ -7462,14 +7462,13 @@ index b6af4ef724f..365582e402d 100644
 +    return [controller webView];
 +}
 +
-+- (WKWebView *)createHeadlessPage:(uint64_t)sessionID
++- (WKWebView *)createHeadlessWebView:(WKWebViewConfiguration *)configuration
 +{
 +    NSRect rect = NSMakeRect(0, 0, 1024, 768);
 +    NSScreen *firstScreen = [[NSScreen screens] objectAtIndex:0];
 +    NSRect windowRect = NSOffsetRect(rect, -10000, [firstScreen frame].size.height - rect.size.height + 10000);
 +    NSWindow* window = [[NSWindow alloc] initWithContentRect:windowRect styleMask:NSWindowStyleMaskBorderless backing:(NSBackingStoreType)_NSBackingStoreUnbuffered defer:YES];
 +
-+    WKWebViewConfiguration *configuration = [self sessionConfiguration:sessionID];
 +    WKWebView* webView = [[WKWebView alloc] initWithFrame:[window.contentView bounds] configuration:configuration];
 +    webView._windowOcclusionDetectionEnabled = NO;
 +    if (!webView)
@@ -7484,6 +7483,12 @@ index b6af4ef724f..365582e402d 100644
 +    return [webView autorelease];
 +}
 +
++- (WKWebView *)createHeadlessPage:(uint64_t)sessionID
++{
++    WKWebViewConfiguration *configuration = [self sessionConfiguration:sessionID];
++    return [self createHeadlessWebView:configuration];
++}
++
 +- (_WKBrowserContext *)createBrowserContext
 +{
 +    _WKBrowserContext *browserContext = [[_WKBrowserContext alloc] init];
@@ -7509,6 +7514,8 @@ index b6af4ef724f..365582e402d 100644
 +    [NSApp performSelector:@selector(terminate:) withObject:nil afterDelay:0.0];
 +}
 +
++#pragma mark WKUIDelegate
++
 +- (void)webViewDidClose:(WKWebView *)webView {
 +    for (NSWindow *window in _headlessWindows) {
 +        if (webView.window != window)
@@ -7562,6 +7569,11 @@ index b6af4ef724f..365582e402d 100644
 +        break;
 +    }
 +}
++
++- (nullable WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures
++{
++    return [self createHeadlessWebView:configuration];
++}
 +
  @end
 diff --git a/Tools/MiniBrowser/mac/SettingsController.m b/Tools/MiniBrowser/mac/SettingsController.m