<!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>[209609] 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/209609">209609</a></dd>
<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>
<dt>Date</dt> <dd>2016-12-09 09:45:29 -0800 (Fri, 09 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Complete the revert of <a href="http://trac.webkit.org/projects/webkit/changeset/208865">r208865</a>.
https://bugs.webkit.org/show_bug.cgi?id=164894
Unreviewed build fix.
* MiniBrowser/mac/SettingsController.h:
* MiniBrowser/mac/SettingsController.m:
(-[SettingsController _populateMenu]):
(-[SettingsController validateMenuItem:]):
(-[SettingsController loadsAllSiteIcons]): Deleted.
(-[SettingsController toggleLoadsAllSiteIcons:]): Deleted.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController awakeFromNib]):
(-[WK2BrowserWindowController webView:shouldLoadIconWithParameters:completionHandler:]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</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>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209608 => 209609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-12-09 17:27:25 UTC (rev 209608)
+++ trunk/Tools/ChangeLog 2016-12-09 17:45:29 UTC (rev 209609)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-12-09 Ryan Haddad <ryanhaddad@apple.com>
+
+ Complete the revert of r208865.
+ https://bugs.webkit.org/show_bug.cgi?id=164894
+
+ Unreviewed build fix.
+
+ * MiniBrowser/mac/SettingsController.h:
+ * MiniBrowser/mac/SettingsController.m:
+ (-[SettingsController _populateMenu]):
+ (-[SettingsController validateMenuItem:]):
+ (-[SettingsController loadsAllSiteIcons]): Deleted.
+ (-[SettingsController toggleLoadsAllSiteIcons:]): Deleted.
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController awakeFromNib]):
+ (-[WK2BrowserWindowController webView:shouldLoadIconWithParameters:completionHandler:]): Deleted.
+
</ins><span class="cx"> 2016-12-09 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
</span><span class="cx">
</span><span class="cx"> [GTK] Force GDK backend to x11 when running with XvfbDriver
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (209608 => 209609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.h 2016-12-09 17:27:25 UTC (rev 209608)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.h 2016-12-09 17:45:29 UTC (rev 209609)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> @property (nonatomic, readonly) BOOL visualViewportEnabled;
</span><span class="cx"> @property (nonatomic, readonly) BOOL largeImageAsyncDecodingEnabled;
</span><span class="cx"> @property (nonatomic, readonly) BOOL animatedImageAsyncDecodingEnabled;
</span><del>-@property (nonatomic, readonly) BOOL loadsAllSiteIcons;
</del><ins>+@property (nonatomic, readonly) BOOL asyncImageDecodingEnabled;
</ins><span class="cx"> @property (nonatomic, readonly) BOOL usesGameControllerFramework;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) NSString *defaultURL;
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (209608 => 209609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.m 2016-12-09 17:27:25 UTC (rev 209608)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m 2016-12-09 17:45:29 UTC (rev 209609)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> static NSString * const SimpleLineLayoutDebugBordersEnabledPreferenceKey = @"SimpleLineLayoutDebugBordersEnabled";
</span><span class="cx"> static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible";
</span><span class="cx"> static NSString * const ResourceUsageOverlayVisiblePreferenceKey = @"ResourceUsageOverlayVisible";
</span><del>-static NSString * const LoadsAllSiteIconsKey = @"LoadsAllSiteIcons";
</del><span class="cx"> static NSString * const UsesGameControllerFrameworkKey = @"UsesGameControllerFramework";
</span><span class="cx"> static NSString * const IncrementalRenderingSuppressedPreferenceKey = @"IncrementalRenderingSuppressed";
</span><span class="cx"> static NSString * const AcceleratedDrawingEnabledPreferenceKey = @"AcceleratedDrawingEnabled";
</span><span class="lines">@@ -138,7 +137,6 @@
</span><span class="cx"> [self _addItemWithTitle:@"Use UI-Side Compositing" action:@selector(toggleUseUISideCompositing:) indented:YES];
</span><span class="cx"> [self _addItemWithTitle:@"Disable Per-Window Web Processes" action:@selector(togglePerWindowWebProcessesDisabled:) indented:YES];
</span><span class="cx"> [self _addItemWithTitle:@"Show Resource Usage Overlay" action:@selector(toggleShowResourceUsageOverlay:) indented:YES];
</span><del>- [self _addItemWithTitle:@"Load All Site Icons Per-Page" action:@selector(toggleLoadsAllSiteIcons:) indented:YES];
</del><span class="cx"> [self _addItemWithTitle:@"Use GameController.framework on macOS (Restart required)" action:@selector(toggleUsesGameControllerFramework:) indented:YES];
</span><span class="cx">
</span><span class="cx"> NSMenuItem *debugOverlaysSubmenuItem = [[NSMenuItem alloc] initWithTitle:@"Debug Overlays" action:nil keyEquivalent:@""];
</span><span class="lines">@@ -215,8 +213,6 @@
</span><span class="cx"> [menuItem setState:[self tiledScrollingIndicatorVisible] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleShowResourceUsageOverlay:))
</span><span class="cx"> [menuItem setState:[self resourceUsageOverlayVisible] ? NSOnState : NSOffState];
</span><del>- else if (action == @selector(toggleLoadsAllSiteIcons:))
- [menuItem setState:[self loadsAllSiteIcons] ? NSOnState : NSOffState];
</del><span class="cx"> else if (action == @selector(toggleUsesGameControllerFramework:))
</span><span class="cx"> [menuItem setState:[self usesGameControllerFramework] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleUseUISideCompositing:))
</span><span class="lines">@@ -366,16 +362,6 @@
</span><span class="cx"> [self _toggleBooleanDefault:ResourceUsageOverlayVisiblePreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)loadsAllSiteIcons
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:LoadsAllSiteIconsKey];
-}
-
-- (void)toggleLoadsAllSiteIcons:(id)sender
-{
- [self _toggleBooleanDefault:LoadsAllSiteIconsKey];
-}
-
</del><span class="cx"> - (BOOL)usesGameControllerFramework
</span><span class="cx"> {
</span><span class="cx"> return [[NSUserDefaults standardUserDefaults] boolForKey:UsesGameControllerFrameworkKey];
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (209608 => 209609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2016-12-09 17:27:25 UTC (rev 209608)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2016-12-09 17:45:29 UTC (rev 209609)
</span><span class="lines">@@ -38,13 +38,11 @@
</span><span class="cx"> #import <WebKit/WKWebViewPrivate.h>
</span><span class="cx"> #import <WebKit/WKWebsiteDataStorePrivate.h>
</span><span class="cx"> #import <WebKit/WebNSURLExtras.h>
</span><del>-#import <WebKit/_WKIconLoadingDelegate.h>
-#import <WebKit/_WKLinkIconParameters.h>
</del><span class="cx"> #import <WebKit/_WKUserInitiatedAction.h>
</span><span class="cx">
</span><span class="cx"> static void* keyValueObservingContext = &keyValueObservingContext;
</span><span class="cx">
</span><del>-@interface WK2BrowserWindowController () <WKNavigationDelegate, WKUIDelegate, _WKIconLoadingDelegate>
</del><ins>+@interface WK2BrowserWindowController () <WKNavigationDelegate, WKUIDelegate>
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WK2BrowserWindowController {
</span><span class="lines">@@ -75,11 +73,6 @@
</span><span class="cx">
</span><span class="cx"> _webView.navigationDelegate = self;
</span><span class="cx"> _webView.UIDelegate = self;
</span><del>-
- // This setting installs the new WK2 Icon Loading Delegate and tests that mechanism by
- // telling WebKit to load every icon referenced by the page.
- if ([[SettingsController shared] loadsAllSiteIcons])
- _webView._iconLoadingDelegate = self;
</del><span class="cx">
</span><span class="cx"> _webView._observedRenderingProgressEvents = _WKRenderingProgressEventFirstLayout
</span><span class="cx"> | _WKRenderingProgressEventFirstVisuallyNonEmptyLayout
</span><span class="lines">@@ -657,13 +650,6 @@
</span><span class="cx"> LOG(@"renderingProgressDidChange: %@", @"first paint after suppressed incremental rendering");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)webView:(WKWebView *)webView shouldLoadIconWithParameters:(_WKLinkIconParameters *)parameters completionHandler:(void (^)(void (^)(NSData*)))completionHandler
-{
- completionHandler(^void (NSData *data) {
- LOG(@"Icon URL %@ received icon data of length %u", parameters.url, (unsigned)data.length);
- });
-}
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre>
</div>
</div>
</body>
</html>