Changeset 209609 in webkit


Ignore:
Timestamp:
Dec 9, 2016 9:45:29 AM (7 years ago)
Author:
Ryan Haddad
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.

Location:
trunk/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r209606 r209609  
     12016-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
    1182016-12-09  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
    219

  • trunk/Tools/MiniBrowser/mac/SettingsController.h

    r209159 r209609  
    5353@property (nonatomic, readonly) BOOL largeImageAsyncDecodingEnabled;
    5454@property (nonatomic, readonly) BOOL animatedImageAsyncDecodingEnabled;
    55 @property (nonatomic, readonly) BOOL loadsAllSiteIcons;
     55@property (nonatomic, readonly) BOOL asyncImageDecodingEnabled;
    5656@property (nonatomic, readonly) BOOL usesGameControllerFramework;
    5757

  • trunk/Tools/MiniBrowser/mac/SettingsController.m

    r209159 r209609  
    4242static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible";
    4343static NSString * const ResourceUsageOverlayVisiblePreferenceKey = @"ResourceUsageOverlayVisible";
    44 static NSString * const LoadsAllSiteIconsKey = @"LoadsAllSiteIcons";
    4544static NSString * const UsesGameControllerFrameworkKey = @"UsesGameControllerFramework";
    4645static NSString * const IncrementalRenderingSuppressedPreferenceKey = @"IncrementalRenderingSuppressed";
    … …  
    139138    [self _addItemWithTitle:@"Disable Per-Window Web Processes" action:@selector(togglePerWindowWebProcessesDisabled:) indented:YES];
    140139    [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];
    142140    [self _addItemWithTitle:@"Use GameController.framework on macOS (Restart required)" action:@selector(toggleUsesGameControllerFramework:) indented:YES];
    143141
    … …  
    216214    else if (action == @selector(toggleShowResourceUsageOverlay:))
    217215        [menuItem setState:[self resourceUsageOverlayVisible] ? NSOnState : NSOffState];
    218     else if (action == @selector(toggleLoadsAllSiteIcons:))
    219         [menuItem setState:[self loadsAllSiteIcons] ? NSOnState : NSOffState];
    220216    else if (action == @selector(toggleUsesGameControllerFramework:))
    221217        [menuItem setState:[self usesGameControllerFramework] ? NSOnState : NSOffState];
    … …  
    367363}
    368364
    369 - (BOOL)loadsAllSiteIcons
    370 {
    371     return [[NSUserDefaults standardUserDefaults] boolForKey:LoadsAllSiteIconsKey];
    372 }
    373 
    374 - (void)toggleLoadsAllSiteIcons:(id)sender
    375 {
    376     [self _toggleBooleanDefault:LoadsAllSiteIconsKey];
    377 }
    378 
    379365- (BOOL)usesGameControllerFramework
    380366{

  • trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

    r209159 r209609  
    3939#import <WebKit/WKWebsiteDataStorePrivate.h>
    4040#import <WebKit/WebNSURLExtras.h>
    41 #import <WebKit/_WKIconLoadingDelegate.h>
    42 #import <WebKit/_WKLinkIconParameters.h>
    4341#import <WebKit/_WKUserInitiatedAction.h>
    4442
    4543static void* keyValueObservingContext = &keyValueObservingContext;
    4644
    47 @interface WK2BrowserWindowController () <WKNavigationDelegate, WKUIDelegate, _WKIconLoadingDelegate>
     45@interface WK2BrowserWindowController () <WKNavigationDelegate, WKUIDelegate>
    4846@end
    4947
    … …  
    7674    _webView.navigationDelegate = self;
    7775    _webView.UIDelegate = self;
    78 
    79     // This setting installs the new WK2 Icon Loading Delegate and tests that mechanism by
    80     // telling WebKit to load every icon referenced by the page.
    81     if ([[SettingsController shared] loadsAllSiteIcons])
    82         _webView._iconLoadingDelegate = self;
    8376   
    8477    _webView._observedRenderingProgressEvents = _WKRenderingProgressEventFirstLayout
    … …  
    658651}
    659652
    660 - (void)webView:(WKWebView *)webView shouldLoadIconWithParameters:(_WKLinkIconParameters *)parameters completionHandler:(void (^)(void (^)(NSData*)))completionHandler
    661 {
    662     completionHandler(^void (NSData *data) {
    663         LOG(@"Icon URL %@ received icon data of length %u", parameters.url, (unsigned)data.length);
    664     });
    665 }
    666 
    667653@end
    668654
Note: See TracChangeset for help on using the changeset viewer.