Changeset 223857 in webkit

Timestamp:

Oct 23, 2017 2:58:42 PM (6 years ago)

Author:

timothy_horton@apple.com

Message:

Stop using _UIApplicationUsesLegacyUI()
​https://bugs.webkit.org/show_bug.cgi?id=178680
<rdar://problem/35131949>

Reviewed by Dan Bernstein.

• Platform/spi/ios/UIKitSPI.h:
• UIProcess/ios/forms/WKFormSelectPopover.mm:

(-[WKSelectTableViewController tableView:cellForRowAtIndexPath:]):
(-[WKSelectPopover initWithView:hasGroups:]):
Resolve _UIApplicationUsesLegacyUI to false and simplify.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/UIKitSPI.h (modified) (1 diff)
• UIProcess/ios/forms/WKFormSelectPopover.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-23  Tim Horton  <timothy_horton@apple.com>
+
+        Stop using _UIApplicationUsesLegacyUI()
+        https://bugs.webkit.org/show_bug.cgi?id=178680
+        <rdar://problem/35131949>
+
+        Reviewed by Dan Bernstein.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/ios/forms/WKFormSelectPopover.mm:
+        (-[WKSelectTableViewController tableView:cellForRowAtIndexPath:]):
+        (-[WKSelectPopover initWithView:hasGroups:]):
+        Resolve _UIApplicationUsesLegacyUI to false and simplify.
+
 2017-10-23  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h

@@ -983 +983 @@
 BOOL _UIApplicationIsExtension(void);
 void _UIApplicationLoadWebKit(void);
-BOOL _UIApplicationUsesLegacyUI(void);
 
 void UIImageDataWriteToSavedPhotosAlbum(NSData *imageData, id completionTarget, SEL completionSelector, void *contextInfo);

trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm

@@ -265 +265 @@
     
     // Assume all cells have the same available text width.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    CGFloat initialFontSize = _UIApplicationUsesLegacyUI() ? UITableViewCellDefaultFontSize : cell.textLabel.font.pointSize;
-    UIFont *font = _UIApplicationUsesLegacyUI() ? [UIFont boldSystemFontOfSize:initialFontSize] : cell.textLabel.font;
-#pragma clang diagnostic pop
+    UIFont *font = cell.textLabel.font;
+    CGFloat initialFontSize = font.pointSize;
     ASSERT(initialFontSize);
     if (textRect.size.width != _maximumTextWidth || _fontSize == 0) {
@@ -394 +391 @@
     UINavigationController *navController = nil;
     NSString *title = view.assistedNodeInformation.title;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    BOOL needsNavigationController = (self.view && _UIApplicationUsesLegacyUI()) || [title length];
-#pragma clang diagnostic pop
+    BOOL needsNavigationController = !!title.length;
     if (needsNavigationController) {
         navController = [[UINavigationController alloc] initWithRootViewController:_tableViewController.get()];
         popoverViewController = navController;
-        
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        if (self.view.assistedNodeInformation.isMultiSelect && _UIApplicationUsesLegacyUI())
-#pragma clang diagnostic pop
-            _tableViewController.get().navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(_userActionDismissedPopover:)] autorelease];
     }