Title: [209609] trunk/Tools
- Revision
- 209609
- Author
- [email protected]
- Date
- 2016-12-09 09:45:29 -0800 (Fri, 09 Dec 2016)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (209608 => 209609)
--- trunk/Tools/ChangeLog 2016-12-09 17:27:25 UTC (rev 209608)
+++ trunk/Tools/ChangeLog 2016-12-09 17:45:29 UTC (rev 209609)
@@ -1,3 +1,20 @@
+2016-12-09 Ryan Haddad <[email protected]>
+
+ 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.
+
2016-12-09 Gustavo Noronha Silva <[email protected]>
[GTK] Force GDK backend to x11 when running with XvfbDriver
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (209608 => 209609)
--- 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)
@@ -52,7 +52,7 @@
@property (nonatomic, readonly) BOOL visualViewportEnabled;
@property (nonatomic, readonly) BOOL largeImageAsyncDecodingEnabled;
@property (nonatomic, readonly) BOOL animatedImageAsyncDecodingEnabled;
-@property (nonatomic, readonly) BOOL loadsAllSiteIcons;
+@property (nonatomic, readonly) BOOL asyncImageDecodingEnabled;
@property (nonatomic, readonly) BOOL usesGameControllerFramework;
@property (nonatomic, readonly) NSString *defaultURL;
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (209608 => 209609)
--- 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)
@@ -41,7 +41,6 @@
static NSString * const SimpleLineLayoutDebugBordersEnabledPreferenceKey = @"SimpleLineLayoutDebugBordersEnabled";
static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible";
static NSString * const ResourceUsageOverlayVisiblePreferenceKey = @"ResourceUsageOverlayVisible";
-static NSString * const LoadsAllSiteIconsKey = @"LoadsAllSiteIcons";
static NSString * const UsesGameControllerFrameworkKey = @"UsesGameControllerFramework";
static NSString * const IncrementalRenderingSuppressedPreferenceKey = @"IncrementalRenderingSuppressed";
static NSString * const AcceleratedDrawingEnabledPreferenceKey = @"AcceleratedDrawingEnabled";
@@ -138,7 +137,6 @@
[self _addItemWithTitle:@"Use UI-Side Compositing" action:@selector(toggleUseUISideCompositing:) indented:YES];
[self _addItemWithTitle:@"Disable Per-Window Web Processes" action:@selector(togglePerWindowWebProcessesDisabled:) indented:YES];
[self _addItemWithTitle:@"Show Resource Usage Overlay" action:@selector(toggleShowResourceUsageOverlay:) indented:YES];
- [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];
NSMenuItem *debugOverlaysSubmenuItem = [[NSMenuItem alloc] initWithTitle:@"Debug Overlays" action:nil keyEquivalent:@""];
@@ -215,8 +213,6 @@
[menuItem setState:[self tiledScrollingIndicatorVisible] ? NSOnState : NSOffState];
else if (action == @selector(toggleShowResourceUsageOverlay:))
[menuItem setState:[self resourceUsageOverlayVisible] ? NSOnState : NSOffState];
- else if (action == @selector(toggleLoadsAllSiteIcons:))
- [menuItem setState:[self loadsAllSiteIcons] ? NSOnState : NSOffState];
else if (action == @selector(toggleUsesGameControllerFramework:))
[menuItem setState:[self usesGameControllerFramework] ? NSOnState : NSOffState];
else if (action == @selector(toggleUseUISideCompositing:))
@@ -366,16 +362,6 @@
[self _toggleBooleanDefault:ResourceUsageOverlayVisiblePreferenceKey];
}
-- (BOOL)loadsAllSiteIcons
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:LoadsAllSiteIconsKey];
-}
-
-- (void)toggleLoadsAllSiteIcons:(id)sender
-{
- [self _toggleBooleanDefault:LoadsAllSiteIconsKey];
-}
-
- (BOOL)usesGameControllerFramework
{
return [[NSUserDefaults standardUserDefaults] boolForKey:UsesGameControllerFrameworkKey];
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (209608 => 209609)
--- 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)
@@ -38,13 +38,11 @@
#import <WebKit/WKWebViewPrivate.h>
#import <WebKit/WKWebsiteDataStorePrivate.h>
#import <WebKit/WebNSURLExtras.h>
-#import <WebKit/_WKIconLoadingDelegate.h>
-#import <WebKit/_WKLinkIconParameters.h>
#import <WebKit/_WKUserInitiatedAction.h>
static void* keyValueObservingContext = &keyValueObservingContext;
-@interface WK2BrowserWindowController () <WKNavigationDelegate, WKUIDelegate, _WKIconLoadingDelegate>
+@interface WK2BrowserWindowController () <WKNavigationDelegate, WKUIDelegate>
@end
@implementation WK2BrowserWindowController {
@@ -75,11 +73,6 @@
_webView.navigationDelegate = self;
_webView.UIDelegate = self;
-
- // 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;
_webView._observedRenderingProgressEvents = _WKRenderingProgressEventFirstLayout
| _WKRenderingProgressEventFirstVisuallyNonEmptyLayout
@@ -657,13 +650,6 @@
LOG(@"renderingProgressDidChange: %@", @"first paint after suppressed incremental rendering");
}
-- (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);
- });
-}
-
@end
#endif // WK_API_ENABLED
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
