Title: [223851] trunk/Source/WebKit
- Revision
- 223851
- Author
- [email protected]
- Date
- 2017-10-23 13:32:34 -0700 (Mon, 23 Oct 2017)
Log Message
Unreviewed, suppress deprecation warnings to fix the build.
<rdar://problem/35131949>
* UIProcess/ios/forms/WKFormSelectPopover.mm:
(-[WKSelectTableViewController tableView:cellForRowAtIndexPath:]):
(-[WKSelectPopover initWithView:hasGroups:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (223850 => 223851)
--- trunk/Source/WebKit/ChangeLog 2017-10-23 20:23:06 UTC (rev 223850)
+++ trunk/Source/WebKit/ChangeLog 2017-10-23 20:32:34 UTC (rev 223851)
@@ -1,3 +1,12 @@
+2017-10-23 Ryan Haddad <[email protected]>
+
+ Unreviewed, suppress deprecation warnings to fix the build.
+ <rdar://problem/35131949>
+
+ * UIProcess/ios/forms/WKFormSelectPopover.mm:
+ (-[WKSelectTableViewController tableView:cellForRowAtIndexPath:]):
+ (-[WKSelectPopover initWithView:hasGroups:]):
+
2017-10-23 Youenn Fablet <[email protected]>
TestController should clear all fetch caches when resetting its state
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm (223850 => 223851)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm 2017-10-23 20:23:06 UTC (rev 223850)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm 2017-10-23 20:32:34 UTC (rev 223851)
@@ -264,8 +264,11 @@
ASSERT(textRect.size.width > 0.0);
// 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
ASSERT(initialFontSize);
if (textRect.size.width != _maximumTextWidth || _fontSize == 0) {
_maximumTextWidth = textRect.size.width;
@@ -390,12 +393,18 @@
UIViewController *popoverViewController = _tableViewController.get();
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
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];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
