Changeset 209609 in webkit
- Timestamp:
- Dec 9, 2016 9:45:29 AM (7 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r209606 r209609 1 2016-12-09 Ryan Haddad <ryanhaddad@apple.com> 2 3 Complete the revert of r208865. 4 https://bugs.webkit.org/show_bug.cgi?id=164894 5 6 Unreviewed build fix. 7 8 * MiniBrowser/mac/SettingsController.h: 9 * MiniBrowser/mac/SettingsController.m: 10 (-[SettingsController _populateMenu]): 11 (-[SettingsController validateMenuItem:]): 12 (-[SettingsController loadsAllSiteIcons]): Deleted. 13 (-[SettingsController toggleLoadsAllSiteIcons:]): Deleted. 14 * MiniBrowser/mac/WK2BrowserWindowController.m: 15 (-[WK2BrowserWindowController awakeFromNib]): 16 (-[WK2BrowserWindowController webView:shouldLoadIconWithParameters:completionHandler:]): Deleted. 17 1 18 2016-12-09 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> 2 19 -
trunk/Tools/MiniBrowser/mac/SettingsController.h
r209159 r209609 53 53 @property (nonatomic, readonly) BOOL largeImageAsyncDecodingEnabled; 54 54 @property (nonatomic, readonly) BOOL animatedImageAsyncDecodingEnabled; 55 @property (nonatomic, readonly) BOOL loadsAllSiteIcons;55 @property (nonatomic, readonly) BOOL asyncImageDecodingEnabled; 56 56 @property (nonatomic, readonly) BOOL usesGameControllerFramework; 57 57 -
trunk/Tools/MiniBrowser/mac/SettingsController.m
r209159 r209609 42 42 static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible"; 43 43 static NSString * const ResourceUsageOverlayVisiblePreferenceKey = @"ResourceUsageOverlayVisible"; 44 static NSString * const LoadsAllSiteIconsKey = @"LoadsAllSiteIcons";45 44 static NSString * const UsesGameControllerFrameworkKey = @"UsesGameControllerFramework"; 46 45 static NSString * const IncrementalRenderingSuppressedPreferenceKey = @"IncrementalRenderingSuppressed"; … … 139 138 [self _addItemWithTitle:@"Disable Per-Window Web Processes" action:@selector(togglePerWindowWebProcessesDisabled:) indented:YES]; 140 139 [self _addItemWithTitle:@"Show Resource Usage Overlay" action:@selector(toggleShowResourceUsageOverlay:) indented:YES]; 141 [self _addItemWithTitle:@"Load All Site Icons Per-Page" action:@selector(toggleLoadsAllSiteIcons:) indented:YES];142 140 [self _addItemWithTitle:@"Use GameController.framework on macOS (Restart required)" action:@selector(toggleUsesGameControllerFramework:) indented:YES]; 143 141 … … 216 214 else if (action == @selector(toggleShowResourceUsageOverlay:)) 217 215 [menuItem setState:[self resourceUsageOverlayVisible] ? NSOnState : NSOffState]; 218 else if (action == @selector(toggleLoadsAllSiteIcons:))219 [menuItem setState:[self loadsAllSiteIcons] ? NSOnState : NSOffState];220 216 else if (action == @selector(toggleUsesGameControllerFramework:)) 221 217 [menuItem setState:[self usesGameControllerFramework] ? NSOnState : NSOffState]; … … 367 363 } 368 364 369 - (BOOL)loadsAllSiteIcons370 {371 return [[NSUserDefaults standardUserDefaults] boolForKey:LoadsAllSiteIconsKey];372 }373 374 - (void)toggleLoadsAllSiteIcons:(id)sender375 {376 [self _toggleBooleanDefault:LoadsAllSiteIconsKey];377 }378 379 365 - (BOOL)usesGameControllerFramework 380 366 { -
trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m
r209159 r209609 39 39 #import <WebKit/WKWebsiteDataStorePrivate.h> 40 40 #import <WebKit/WebNSURLExtras.h> 41 #import <WebKit/_WKIconLoadingDelegate.h>42 #import <WebKit/_WKLinkIconParameters.h>43 41 #import <WebKit/_WKUserInitiatedAction.h> 44 42 45 43 static void* keyValueObservingContext = &keyValueObservingContext; 46 44 47 @interface WK2BrowserWindowController () <WKNavigationDelegate, WKUIDelegate , _WKIconLoadingDelegate>45 @interface WK2BrowserWindowController () <WKNavigationDelegate, WKUIDelegate> 48 46 @end 49 47 … … 76 74 _webView.navigationDelegate = self; 77 75 _webView.UIDelegate = self; 78 79 // This setting installs the new WK2 Icon Loading Delegate and tests that mechanism by80 // telling WebKit to load every icon referenced by the page.81 if ([[SettingsController shared] loadsAllSiteIcons])82 _webView._iconLoadingDelegate = self;83 76 84 77 _webView._observedRenderingProgressEvents = _WKRenderingProgressEventFirstLayout … … 658 651 } 659 652 660 - (void)webView:(WKWebView *)webView shouldLoadIconWithParameters:(_WKLinkIconParameters *)parameters completionHandler:(void (^)(void (^)(NSData*)))completionHandler661 {662 completionHandler(^void (NSData *data) {663 LOG(@"Icon URL %@ received icon data of length %u", parameters.url, (unsigned)data.length);664 });665 }666 667 653 @end 668 654
Note: See TracChangeset
for help on using the changeset viewer.