From 10141258845a7660314eb192b2e36b3d7400da16 Mon Sep 17 00:00:00 2001 From: Dmitry Gozman Date: Thu, 20 Feb 2020 11:51:39 -0800 Subject: [PATCH] browser(webkit): support --no-startup-window https://github.com/dgozman/webkit/commit/b8cb5490a3e0234550d0c3202c28e05fdc19fbf5 --- browser_patches/webkit/BUILD_NUMBER | 2 +- browser_patches/webkit/patches/bootstrap.diff | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index d98057a110..7784c898e3 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1 +1 @@ -1152 +1153 diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 7b9ecf0e18..d5d757880e 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -13960,10 +13960,10 @@ index 0000000000000000000000000000000000000000..00fb6b0006c743091a8bbf8edb18b211 + diff --git a/Tools/Playwright/mac/AppDelegate.h b/Tools/Playwright/mac/AppDelegate.h new file mode 100644 -index 0000000000000000000000000000000000000000..41b5751cab626971cd12c5066218c6d14c00fba0 +index 0000000000000000000000000000000000000000..42ea067d455862eab9275d1b466e655340b71070 --- /dev/null +++ b/Tools/Playwright/mac/AppDelegate.h -@@ -0,0 +1,55 @@ +@@ -0,0 +1,56 @@ +/* + * Copyright (C) 2010 Apple Inc. All rights reserved. + * @@ -14001,6 +14001,7 @@ index 0000000000000000000000000000000000000000..41b5751cab626971cd12c5066218c6d1 + NSMutableSet *_headlessWindows; + NSMutableSet *_browserContexts; + bool _headless; ++ bool _no_startup_window; + NSMutableSet *_dialogs; + NSString* _initialURL; + NSString* _userDataDir; @@ -14021,10 +14022,10 @@ index 0000000000000000000000000000000000000000..41b5751cab626971cd12c5066218c6d1 +@end diff --git a/Tools/Playwright/mac/AppDelegate.m b/Tools/Playwright/mac/AppDelegate.m new file mode 100644 -index 0000000000000000000000000000000000000000..7fbd8c5426eb43b96a7c8e793a7f85810819053e +index 0000000000000000000000000000000000000000..637029587153f5157a3a046877840dda1a4bdfe1 --- /dev/null +++ b/Tools/Playwright/mac/AppDelegate.m -@@ -0,0 +1,490 @@ +@@ -0,0 +1,492 @@ +/* + * Copyright (C) 2010-2016 Apple Inc. All rights reserved. + * @@ -14127,6 +14128,7 @@ index 0000000000000000000000000000000000000000..7fbd8c5426eb43b96a7c8e793a7f8581 + } + + _headless = [arguments containsObject: @"--headless"]; ++ _no_startup_window = [arguments containsObject: @"--no-startup-window"]; + _browserContexts = [[NSMutableSet alloc] init]; + + if (_headless) { @@ -14271,7 +14273,8 @@ index 0000000000000000000000000000000000000000..7fbd8c5426eb43b96a7c8e793a7f8581 +- (void)applicationDidFinishLaunching:(NSNotification *)aNotification +{ + if (_headless) { -+ [self createNewPage:0]; ++ if (!_no_startup_window) ++ [self createNewPage:0]; + return; + } + @@ -14280,7 +14283,7 @@ index 0000000000000000000000000000000000000000..7fbd8c5426eb43b96a7c8e793a7f8581 + [webHistory release]; + + [self _updateNewWindowKeyEquivalents]; -+ if (!_initialURL) ++ if (!_initialURL && !_no_startup_window) + [self newWindow:self]; + _initialURL = nil; +}