From 1d02c2d26840a8c01a5b426a73503b8a3ad88503 Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Tue, 25 Feb 2020 21:23:47 -0800 Subject: [PATCH] browser(webkit): --no-startup-window for mac (#1118) --- browser_patches/webkit/BUILD_NUMBER | 2 +- browser_patches/webkit/patches/bootstrap.diff | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index ba3343d500..1b66bc15fe 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1 +1 @@ -1158 +1159 diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 9c79b143a8..c55c8091e3 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -13661,10 +13661,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..d98c51764861371a35e78a8888bb6e81522951f4 --- /dev/null +++ b/Tools/Playwright/mac/AppDelegate.h -@@ -0,0 +1,55 @@ +@@ -0,0 +1,56 @@ +/* + * Copyright (C) 2010 Apple Inc. All rights reserved. + * @@ -13702,6 +13702,7 @@ index 0000000000000000000000000000000000000000..41b5751cab626971cd12c5066218c6d1 + NSMutableSet *_headlessWindows; + NSMutableSet *_browserContexts; + bool _headless; ++ bool _noStartupWindow; + NSMutableSet *_dialogs; + NSString* _initialURL; + NSString* _userDataDir; @@ -13722,10 +13723,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..6d6c3a8c8e56e740ed37149e61f9daf58854a6c2 --- /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. + * @@ -13828,6 +13829,7 @@ index 0000000000000000000000000000000000000000..7fbd8c5426eb43b96a7c8e793a7f8581 + } + + _headless = [arguments containsObject: @"--headless"]; ++ _noStartupWindow = [arguments containsObject: @"--no-startup-window"]; + _browserContexts = [[NSMutableSet alloc] init]; + + if (_headless) { @@ -13971,15 +13973,16 @@ index 0000000000000000000000000000000000000000..7fbd8c5426eb43b96a7c8e793a7f8581 + +- (void)applicationDidFinishLaunching:(NSNotification *)aNotification +{ ++ if (_noStartupWindow) { ++ _initialURL = nil; ++ return; ++ } ++ + if (_headless) { + [self createNewPage:0]; + return; + } + -+ WebHistory *webHistory = [[WebHistory alloc] init]; -+ [WebHistory setOptionalSharedHistory:webHistory]; -+ [webHistory release]; -+ + [self _updateNewWindowKeyEquivalents]; + if (!_initialURL) + [self newWindow:self];