<!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>[204397] 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/204397">204397</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-08-11 17:35:21 -0700 (Thu, 11 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add WK2 ExperimentalFeature support to MiniBrowser.
https://bugs.webkit.org/show_bug.cgi?id=160788
Reviewed by Alex Christensen.
* MiniBrowser/mac/AppDelegate.h:
* MiniBrowser/mac/AppDelegate.m:
(defaultConfiguration):
(defaultPreferences):
* MiniBrowser/mac/SettingsController.m:
(-[SettingsController _populateMenu]):
(-[SettingsController validateMenuItem:]):
(-[SettingsController toggleExperimentalFeature:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegateh">trunk/Tools/MiniBrowser/mac/AppDelegate.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegatem">trunk/Tools/MiniBrowser/mac/AppDelegate.m</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 (204396 => 204397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-12 00:35:18 UTC (rev 204396)
+++ trunk/Tools/ChangeLog 2016-08-12 00:35:21 UTC (rev 204397)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-08-11 Brady Eidson <beidson@apple.com>
+
+ Add WK2 ExperimentalFeature support to MiniBrowser.
+ https://bugs.webkit.org/show_bug.cgi?id=160788
+
+ Reviewed by Alex Christensen.
+
+ * MiniBrowser/mac/AppDelegate.h:
+ * MiniBrowser/mac/AppDelegate.m:
+ (defaultConfiguration):
+ (defaultPreferences):
+
+ * MiniBrowser/mac/SettingsController.m:
+ (-[SettingsController _populateMenu]):
+ (-[SettingsController validateMenuItem:]):
+ (-[SettingsController toggleExperimentalFeature:]):
+
</ins><span class="cx"> 2016-08-11 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> Keep EWS logs for longer
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.h (204396 => 204397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.h 2016-08-12 00:35:18 UTC (rev 204396)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.h 2016-08-12 00:35:21 UTC (rev 204397)
</span><span class="lines">@@ -44,3 +44,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+#if WK_API_ENABLED
+WKPreferences *defaultPreferences();
+#endif
</ins></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (204396 => 204397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2016-08-12 00:35:18 UTC (rev 204396)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2016-08-12 00:35:21 UTC (rev 204397)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import <WebKit/WKWebViewConfigurationPrivate.h>
</span><span class="cx"> #import <WebKit/WKWebsiteDataStorePrivate.h>
</span><span class="cx"> #import <WebKit/WebKit.h>
</span><ins>+#import <WebKit/_WKExperimentalFeature.h>
</ins><span class="cx"> #import <WebKit/_WKProcessPoolConfiguration.h>
</span><span class="cx"> #import <WebKit/_WKUserContentExtensionStore.h>
</span><span class="cx">
</span><span class="lines">@@ -81,6 +82,12 @@
</span><span class="cx"> configuration.processPool = [[[WKProcessPool alloc] _initWithConfiguration:singleProcessConfiguration] autorelease];
</span><span class="cx"> [singleProcessConfiguration release];
</span><span class="cx"> }
</span><ins>+
+ NSArray<_WKExperimentalFeature *> *features = [WKPreferences _experimentalFeatures];
+ for (_WKExperimentalFeature *feature in features) {
+ BOOL enabled = [[NSUserDefaults standardUserDefaults] boolForKey:feature.key];
+ [configuration.preferences _setEnabled:enabled forFeature:feature];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> configuration.suppressesIncrementalRendering = [SettingsController shared].incrementalRenderingSuppressed;
</span><span class="lines">@@ -87,6 +94,12 @@
</span><span class="cx"> configuration.websiteDataStore._resourceLoadStatisticsEnabled = [SettingsController shared].resourceLoadStatisticsEnabled;
</span><span class="cx"> return configuration;
</span><span class="cx"> }
</span><ins>+
+WKPreferences *defaultPreferences()
+{
+ return defaultConfiguration().preferences;
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (204396 => 204397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.m 2016-08-12 00:35:18 UTC (rev 204396)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m 2016-08-12 00:35:21 UTC (rev 204397)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx">
</span><span class="cx"> #import "AppDelegate.h"
</span><span class="cx"> #import "BrowserWindowController.h"
</span><ins>+#import <WebKit/WKPreferencesPrivate.h>
+#import <WebKit/_WKExperimentalFeature.h>
</ins><span class="cx">
</span><span class="cx"> static NSString * const defaultURL = @"http://www.webkit.org/";
</span><span class="cx"> static NSString * const DefaultURLPreferenceKey = @"DefaultURL";
</span><span class="lines">@@ -55,7 +57,8 @@
</span><span class="cx">
</span><span class="cx"> typedef NS_ENUM(NSInteger, DebugOverylayMenuItemTag) {
</span><span class="cx"> NonFastScrollableRegionOverlayTag = 100,
</span><del>- WheelEventHandlerRegionOverlayTag
</del><ins>+ WheelEventHandlerRegionOverlayTag,
+ ExperimentalFeatureTag,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> @implementation SettingsController
</span><span class="lines">@@ -140,6 +143,24 @@
</span><span class="cx"> [_menu addItem:debugOverlaysSubmenuItem];
</span><span class="cx"> [debugOverlaysSubmenuItem release];
</span><span class="cx">
</span><ins>+ NSMenuItem *experimentalFeaturesSubmenuItem = [[NSMenuItem alloc] initWithTitle:@"Experimental Features" action:nil keyEquivalent:@""];
+ NSMenu *experimentalFeaturesMenu = [[NSMenu alloc] initWithTitle:@"Experimental Features"];
+ [experimentalFeaturesSubmenuItem setSubmenu:experimentalFeaturesMenu];
+
+ NSArray<_WKExperimentalFeature *> *features = [WKPreferences _experimentalFeatures];
+
+ for (_WKExperimentalFeature *feature in features) {
+ NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:feature.name action:@selector(toggleExperimentalFeature:) keyEquivalent:@""];
+ item.representedObject = feature;
+
+ [item setTag:ExperimentalFeatureTag];
+ [item setTarget:self];
+ [experimentalFeaturesMenu addItem:[item autorelease]];
+ }
+
+ [_menu addItem:experimentalFeaturesSubmenuItem];
+ [experimentalFeaturesSubmenuItem release];
+
</ins><span class="cx"> [self _addHeaderWithTitle:@"WebKit1-only Settings"];
</span><span class="cx"> [self _addItemWithTitle:@"Enable Subpixel CSSOM Metrics" action:@selector(toggleEnableSubPixelCSSOMMetrics:) indented:YES];
</span><span class="cx"> }
</span><span class="lines">@@ -179,6 +200,11 @@
</span><span class="cx"> else if (action == @selector(toggleDebugOverlay:))
</span><span class="cx"> [menuItem setState:[self debugOverlayVisible:menuItem] ? NSOnState : NSOffState];
</span><span class="cx">
</span><ins>+ if (menuItem.tag == ExperimentalFeatureTag) {
+ _WKExperimentalFeature *feature = menuItem.representedObject;
+ [menuItem setState:[defaultPreferences() _isEnabledForFeature:feature] ? NSOnState : NSOffState];
+ }
+
</ins><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -369,6 +395,17 @@
</span><span class="cx"> [self _toggleBooleanDefault:preferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)toggleExperimentalFeature:(id)sender
+{
+ _WKExperimentalFeature *feature = ((NSMenuItem *)sender).representedObject;
+ WKPreferences *preferences = defaultPreferences();
+
+ BOOL currentlyEnabled = [preferences _isEnabledForFeature:feature];
+ [preferences _setEnabled:!currentlyEnabled forFeature:feature];
+
+ [[NSUserDefaults standardUserDefaults] setBool:!currentlyEnabled forKey:feature.key];
+}
+
</ins><span class="cx"> - (BOOL)debugOverlayVisible:(NSMenuItem *)menuItem
</span><span class="cx"> {
</span><span class="cx"> NSString *preferenceKey = [self preferenceKeyForRegionOverlayTag:[menuItem tag]];
</span></span></pre>
</div>
</div>
</body>
</html>