Attachment 358861 Details for Bug 193344 – [PATCH] Proposed Fix

[patch] [PATCH] Proposed Fix

mini-1.patch (text/plain), 5.48 KB, created by Joseph Pecoraro on 2019-01-10 19:00:57 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Pecoraro

Created: 2019-01-10 19:00:57 PST

Size: 5.48 KB

patch

obsolete

>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index ec0c7524226..392c7e6de5f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-01-10  Joseph Pecoraro  <pecoraro@apple.com>
>+
>+        Remove MiniBrowser custom "Process Swap" menu item which does not work
>+        https://bugs.webkit.org/show_bug.cgi?id=193344
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        There is a menu item under the Experimental menu that does work.
>+
>+        * MiniBrowser/mac/AppDelegate.m:
>+        (defaultConfiguration):
>+        * MiniBrowser/mac/SettingsController.h:
>+        * MiniBrowser/mac/SettingsController.m:
>+        (-[SettingsController _populateMenu]):
>+        (-[SettingsController validateMenuItem:]):
>+        (-[SettingsController processSwapOnNavigationEnabled]): Deleted.
>+        (-[SettingsController toggleProcessSwapOnNavigation:]): Deleted.
>+
> 2019-01-10  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         Cleanup possible WK*Copy/Create leaks in WebKitTestRunner
>diff --git a/Tools/MiniBrowser/mac/AppDelegate.m b/Tools/MiniBrowser/mac/AppDelegate.m
>index 99a500d3994..618d248d2ae 100644
>--- a/Tools/MiniBrowser/mac/AppDelegate.m
>+++ b/Tools/MiniBrowser/mac/AppDelegate.m
>@@ -101,8 +101,6 @@ - (void)awakeFromNib
>         processConfiguration.diskCacheSpeculativeValidationEnabled = ![SettingsController shared].networkCacheSpeculativeRevalidationDisabled;
>         if ([SettingsController shared].perWindowWebProcessesDisabled)
>             processConfiguration.maximumProcessCount = 1;
>-        if ([SettingsController shared].processSwapOnNavigationEnabled)
>-            processConfiguration.processSwapsOnNavigation = true;
>         if ([SettingsController shared].processSwapOnWindowOpenWithOpenerEnabled)
>             processConfiguration.processSwapsOnWindowOpenWithOpener = true;
>         
>diff --git a/Tools/MiniBrowser/mac/SettingsController.h b/Tools/MiniBrowser/mac/SettingsController.h
>index dae71eb93ae..1827f61cf6e 100644
>--- a/Tools/MiniBrowser/mac/SettingsController.h
>+++ b/Tools/MiniBrowser/mac/SettingsController.h
>@@ -62,7 +62,6 @@ @property (nonatomic, readonly) BOOL useSystemAppearance;
> @property (nonatomic, readonly) BOOL loadsAllSiteIcons;
> @property (nonatomic, readonly) BOOL usesGameControllerFramework;
> @property (nonatomic, readonly) BOOL networkCacheSpeculativeRevalidationDisabled;
>-@property (nonatomic, readonly) BOOL processSwapOnNavigationEnabled;
> @property (nonatomic, readonly) BOOL processSwapOnWindowOpenWithOpenerEnabled;
> 
> @property (nonatomic, readonly) NSString *defaultURL;
>diff --git a/Tools/MiniBrowser/mac/SettingsController.m b/Tools/MiniBrowser/mac/SettingsController.m
>index 24a37de9085..85836daf89f 100644
>--- a/Tools/MiniBrowser/mac/SettingsController.m
>+++ b/Tools/MiniBrowser/mac/SettingsController.m
>@@ -74,7 +74,6 @@
> 
> static NSString * const PerWindowWebProcessesDisabledKey = @"PerWindowWebProcessesDisabled";
> static NSString * const NetworkCacheSpeculativeRevalidationDisabledKey = @"NetworkCacheSpeculativeRevalidationDisabled";
>-static NSString * const ProcessSwapOnNavigationKey = @"ProcessSwapOnNavigation";
> static NSString * const ProcessSwapOnWindowOpenWithOpenerKey = @"ProcessSwapOnWindowOpenWithOpener";
> 
> typedef NS_ENUM(NSInteger, DebugOverylayMenuItemTag) {
>@@ -188,7 +187,6 @@ - (void)_populateMenu
>     [self _addItemWithTitle:@"Load All Site Icons Per-Page" action:@selector(toggleLoadsAllSiteIcons:) indented:YES];
>     [self _addItemWithTitle:@"Use GameController.framework on macOS (Restart required)" action:@selector(toggleUsesGameControllerFramework:) indented:YES];
>     [self _addItemWithTitle:@"Disable network cache speculative revalidation" action:@selector(toggleNetworkCacheSpeculativeRevalidationDisabled:) indented:YES];
>-    [self _addItemWithTitle:@"Enable Process Swap on Navigation" action:@selector(toggleProcessSwapOnNavigation:) indented:YES];
>     [self _addItemWithTitle:@"Enable Process Swap on window.open() with an opener" action:@selector(toggleProcessSwapOnWindowOpenWithOpener:) indented:YES];
> 
>     NSMenuItem *debugOverlaysSubmenuItem = [[NSMenuItem alloc] initWithTitle:@"Debug Overlays" action:nil keyEquivalent:@""];
>@@ -307,8 +305,6 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
>         [menuItem setState:[self usesGameControllerFramework] ? NSControlStateValueOn : NSControlStateValueOff];
>     else if (action == @selector(toggleNetworkCacheSpeculativeRevalidationDisabled:))
>         [menuItem setState:[self networkCacheSpeculativeRevalidationDisabled] ? NSControlStateValueOn : NSControlStateValueOff];
>-    else if (action == @selector(toggleProcessSwapOnNavigation:))
>-        [menuItem setState:[self processSwapOnNavigationEnabled] ? NSControlStateValueOn : NSControlStateValueOff];
>     else if (action == @selector(toggleProcessSwapOnWindowOpenWithOpener:))
>         [menuItem setState:[self processSwapOnWindowOpenWithOpenerEnabled] ? NSControlStateValueOn : NSControlStateValueOff];
>     else if (action == @selector(toggleUseUISideCompositing:))
>@@ -530,16 +526,6 @@ - (void)toggleNetworkCacheSpeculativeRevalidationDisabled:(id)sender
>     [self _toggleBooleanDefault:NetworkCacheSpeculativeRevalidationDisabledKey];
> }
> 
>-- (BOOL)processSwapOnNavigationEnabled
>-{
>-    return [[NSUserDefaults standardUserDefaults] boolForKey:ProcessSwapOnNavigationKey];
>-}
>-
>-- (void)toggleProcessSwapOnNavigation:(id)sender
>-{
>-    [self _toggleBooleanDefault:ProcessSwapOnNavigationKey];
>-}
>-
> - (BOOL)processSwapOnWindowOpenWithOpenerEnabled
> {
>     return [[NSUserDefaults standardUserDefaults] boolForKey:ProcessSwapOnWindowOpenWithOpenerKey];

Actions: View | Formatted Diff | Diff

Attachments on bug 193344: 358861