<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[180612] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/180612">180612</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2015-02-24 20:53:43 -0800 (Tue, 24 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Teach MiniBrowser how to disable per-window web processes
https://bugs.webkit.org/show_bug.cgi?id=141988
Reviewed by Darin Adler.
* MiniBrowser/mac/AppDelegate.m:
(defaultConfiguration): Created a _WKProcessPoolConfiguration with maximumProcessCount == 1 if per-window web processes are disabled.
* MiniBrowser/mac/SettingsController.h:
* MiniBrowser/mac/SettingsController.m:
(-[SettingsController _populateMenu]): Added a new Settings menu item.
(-[SettingsController validateMenuItem:]): Validated the new Settings menu item.
(-[SettingsController togglePerWindowWebProcessesDisabled:]): Displayed an alert informing the user that MiniBrowser must be restarted for the setting to take effect.
(-[SettingsController perWindowWebProcessesDisabled]): Returned the value from user defaults.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegatem">trunk/Tools/MiniBrowser/mac/AppDelegate.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacSettingsControllerh">trunk/Tools/MiniBrowser/mac/SettingsController.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacSettingsControllerm">trunk/Tools/MiniBrowser/mac/SettingsController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (180611 => 180612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-25 04:32:49 UTC (rev 180611)
+++ trunk/Tools/ChangeLog 2015-02-25 04:53:43 UTC (rev 180612)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-02-24 Andy Estes <aestes@apple.com>
+
+ Teach MiniBrowser how to disable per-window web processes
+ https://bugs.webkit.org/show_bug.cgi?id=141988
+
+ Reviewed by Darin Adler.
+
+ * MiniBrowser/mac/AppDelegate.m:
+ (defaultConfiguration): Created a _WKProcessPoolConfiguration with maximumProcessCount == 1 if per-window web processes are disabled.
+ * MiniBrowser/mac/SettingsController.h:
+ * MiniBrowser/mac/SettingsController.m:
+ (-[SettingsController _populateMenu]): Added a new Settings menu item.
+ (-[SettingsController validateMenuItem:]): Validated the new Settings menu item.
+ (-[SettingsController togglePerWindowWebProcessesDisabled:]): Displayed an alert informing the user that MiniBrowser must be restarted for the setting to take effect.
+ (-[SettingsController perWindowWebProcessesDisabled]): Returned the value from user defaults.
+
</ins><span class="cx"> 2015-02-24 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Bot watcher's dashboard sometimes hits an assertion: data.num_missing === this.layoutTestResults.testsWithMissingResults.length
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (180611 => 180612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2015-02-25 04:32:49 UTC (rev 180611)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2015-02-25 04:53:43 UTC (rev 180612)
</span><span class="lines">@@ -29,8 +29,10 @@
</span><span class="cx"> #import "WK1BrowserWindowController.h"
</span><span class="cx"> #import "WK2BrowserWindowController.h"
</span><span class="cx"> #import <WebKit/WKPreferencesPrivate.h>
</span><ins>+#import <WebKit/WKProcessPoolPrivate.h>
</ins><span class="cx"> #import <WebKit/WKWebViewConfigurationPrivate.h>
</span><span class="cx"> #import <WebKit/WebKit.h>
</span><ins>+#import <WebKit/_WKProcessPoolConfiguration.h>
</ins><span class="cx"> #import <WebKit/_WKWebsiteDataStore.h>
</span><span class="cx">
</span><span class="cx"> enum {
</span><span class="lines">@@ -66,6 +68,13 @@
</span><span class="cx"> configuration = [[WKWebViewConfiguration alloc] init];
</span><span class="cx"> configuration.preferences._fullScreenEnabled = YES;
</span><span class="cx"> configuration.preferences._developerExtrasEnabled = YES;
</span><ins>+
+ if ([SettingsController shared].perWindowWebProcessesDisabled) {
+ _WKProcessPoolConfiguration *singleProcessConfiguration = [[_WKProcessPoolConfiguration alloc] init];
+ singleProcessConfiguration.maximumProcessCount = 1;
+ configuration.processPool = [[[WKProcessPool alloc] _initWithConfiguration:singleProcessConfiguration] autorelease];
+ [singleProcessConfiguration release];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return configuration;
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (180611 => 180612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.h 2015-02-25 04:32:49 UTC (rev 180611)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.h 2015-02-25 04:53:43 UTC (rev 180612)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> @property (nonatomic, readonly) BOOL nonFastScrollableRegionOverlayVisible;
</span><span class="cx"> @property (nonatomic, readonly) BOOL wheelEventHandlerRegionOverlayVisible;
</span><span class="cx"> @property (nonatomic, readonly) BOOL useUISideCompositing;
</span><ins>+@property (nonatomic, readonly) BOOL perWindowWebProcessesDisabled;
</ins><span class="cx"> @property (nonatomic, readonly) BOOL subPixelCSSOMMetricsEnabled;
</span><span class="cx"> @property (nonatomic, readonly) NSString *defaultURL;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (180611 => 180612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.m 2015-02-25 04:32:49 UTC (rev 180611)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m 2015-02-25 04:53:43 UTC (rev 180612)
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx"> // This default name intentionally overlaps with the key that WebKit2 checks when creating a view.
</span><span class="cx"> static NSString * const UseRemoteLayerTreeDrawingAreaPreferenceKey = @"WebKit2UseRemoteLayerTreeDrawingArea";
</span><span class="cx">
</span><ins>+static NSString * const PerWindowWebProcessesDisabledKey = @"PerWindowWebProcessesDisabled";
+
</ins><span class="cx"> typedef NS_ENUM(NSInteger, DebugOverylayMenuItemTag) {
</span><span class="cx"> NonFastScrollableRegionOverlayTag = 100,
</span><span class="cx"> WheelEventHandlerRegionOverlayTag
</span><span class="lines">@@ -107,6 +109,7 @@
</span><span class="cx">
</span><span class="cx"> [self _addItemWithTitle:@"Show Tiled Scrolling Indicator" action:@selector(toggleShowTiledScrollingIndicator:) indented:YES];
</span><span class="cx"> [self _addItemWithTitle:@"Use UI-Side Compositing" action:@selector(toggleUseUISideCompositing:) indented:YES];
</span><ins>+ [self _addItemWithTitle:@"Disable Per-Window Web Processes" action:@selector(togglePerWindowWebProcessesDisabled:) indented:YES];
</ins><span class="cx">
</span><span class="cx"> NSMenuItem *debugOverlaysSubmenuItem = [[NSMenuItem alloc] initWithTitle:@"Debug Overlays" action:nil keyEquivalent:@""];
</span><span class="cx"> NSMenu *debugOverlaysMenu = [[NSMenu alloc] initWithTitle:@"Debug Overlays"];
</span><span class="lines">@@ -148,6 +151,8 @@
</span><span class="cx"> [menuItem setState:[self tiledScrollingIndicatorVisible] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleUseUISideCompositing:))
</span><span class="cx"> [menuItem setState:[self useUISideCompositing] ? NSOnState : NSOffState];
</span><ins>+ else if (action == @selector(togglePerWindowWebProcessesDisabled:))
+ [menuItem setState:[self perWindowWebProcessesDisabled] ? NSOnState : NSOffState];
</ins><span class="cx"> else if (action == @selector(toggleEnableSubPixelCSSOMMetrics:))
</span><span class="cx"> [menuItem setState:[self subPixelCSSOMMetricsEnabled] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleDebugOverlay:))
</span><span class="lines">@@ -204,6 +209,26 @@
</span><span class="cx"> return [[NSUserDefaults standardUserDefaults] boolForKey:UseRemoteLayerTreeDrawingAreaPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)togglePerWindowWebProcessesDisabled:(id)sender
+{
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:self.perWindowWebProcessesDisabled ? @"Are you sure you want to switch to per-window web processes?" : @"Are you sure you want to switch to a single web process?"];
+ [alert setInformativeText:@"This requires quitting and relaunching MiniBrowser. I'll do the quitting. You will have to do the relaunching."];
+ [alert addButtonWithTitle:@"Switch and Quit"];
+ [alert addButtonWithTitle:@"Cancel"];
+
+ if ([alert runModal] != NSAlertFirstButtonReturn)
+ return;
+
+ [self _toggleBooleanDefault:PerWindowWebProcessesDisabledKey];
+ [NSApp terminate:self];
+}
+
+- (BOOL)perWindowWebProcessesDisabled
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:PerWindowWebProcessesDisabledKey];
+}
+
</ins><span class="cx"> - (void)toggleShowLayerBorders:(id)sender
</span><span class="cx"> {
</span><span class="cx"> [self _toggleBooleanDefault:LayerBordersVisiblePreferenceKey];
</span></span></pre>
</div>
</div>
</body>
</html>