Diff
Modified: trunk/Source/WebKit/ChangeLog (236980 => 236981)
--- trunk/Source/WebKit/ChangeLog 2018-10-09 21:12:54 UTC (rev 236980)
+++ trunk/Source/WebKit/ChangeLog 2018-10-09 21:29:31 UTC (rev 236981)
@@ -1,3 +1,21 @@
+2018-10-09 Daniel Bates <daba...@apple.com>
+
+ [iOS] Ignore some deprecated declarations
+ https://bugs.webkit.org/show_bug.cgi?id=190371
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/ios/WKActionSheet.mm:
+ (-[WKActionSheet init]):
+ (-[WKActionSheet presentSheet:]):
+ * UIProcess/ios/WKActionSheetAssistant.mm:
+ (-[WKActionSheetAssistant presentSheet]):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ * UIProcess/ios/forms/WKFormSelectPicker.mm:
+ (-[WKMultipleSelectPicker initWithView:]):
+ * UIProcess/ios/forms/WKFormSelectPopover.mm:
+ (-[WKSelectTableViewController initWithView:hasGroups:]):
+
2018-10-09 Claudio Saavedra <csaave...@igalia.com>
[WPE] Explicitly link against gmodule where used
Modified: trunk/Source/WebKit/UIProcess/ios/WKActionSheet.mm (236980 => 236981)
--- trunk/Source/WebKit/UIProcess/ios/WKActionSheet.mm 2018-10-09 21:12:54 UTC (rev 236980)
+++ trunk/Source/WebKit/UIProcess/ios/WKActionSheet.mm 2018-10-09 21:29:31 UTC (rev 236981)
@@ -51,6 +51,7 @@
_arrowDirections = UIPopoverArrowDirectionAny;
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPhone) {
// Only iPads support popovers that rotate. UIActionSheets actually block rotation on iPhone/iPod Touch
NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
@@ -57,6 +58,7 @@
[center addObserver:self selector:@selector(willRotate) name:UIWindowWillRotateNotification object:nil];
[center addObserver:self selector:@selector(didRotate) name:UIWindowDidRotateNotification object:nil];
}
+ ALLOW_DEPRECATED_DECLARATIONS_END
return self;
}
@@ -79,11 +81,13 @@
{
// Calculate the presentation rect just before showing.
CGRect presentationRect = CGRectZero;
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPhone) {
presentationRect = [self _presentationRectForStyle:style];
if (CGRectIsEmpty(presentationRect))
return NO;
}
+ ALLOW_DEPRECATED_DECLARATIONS_END
_currentPresentationStyle = style;
return [self presentSheetFromRect:presentationRect];
Modified: trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm (236980 => 236981)
--- trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm 2018-10-09 21:12:54 UTC (rev 236980)
+++ trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm 2018-10-09 21:29:31 UTC (rev 236981)
@@ -248,11 +248,13 @@
{
// Calculate the presentation rect just before showing.
CGRect presentationRect = CGRectZero;
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPhone) {
presentationRect = [self initialPresentationRectInHostViewForSheet];
if (CGRectIsEmpty(presentationRect))
return NO;
}
+ ALLOW_DEPRECATED_DECLARATIONS_END
return [_interactionSheet presentSheetFromRect:presentationRect];
}
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (236980 => 236981)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-10-09 21:12:54 UTC (rev 236980)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-10-09 21:29:31 UTC (rev 236981)
@@ -3467,6 +3467,7 @@
return nil;
}
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- (UITextWritingDirection)baseWritingDirectionForPosition:(UITextPosition *)position inDirection:(UITextStorageDirection)direction
{
return UITextWritingDirectionLeftToRight;
@@ -3475,6 +3476,7 @@
- (void)setBaseWritingDirection:(UITextWritingDirection)writingDirection forRange:(UITextRange *)range
{
}
+ALLOW_DEPRECATED_DECLARATIONS_END
- (CGRect)firstRectForRange:(UITextRange *)range
{
@@ -6531,10 +6533,12 @@
return _webRect.rect;
}
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- (UITextWritingDirection)writingDirection
{
return (UITextWritingDirection)_webRect.writingDirection;
}
+ALLOW_DEPRECATED_DECLARATIONS_END
- (UITextRange *)range
{
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm (236980 => 236981)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm 2018-10-09 21:12:54 UTC (rev 236980)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm 2018-10-09 21:29:31 UTC (rev 236981)
@@ -154,10 +154,11 @@
[self _setUsesCheckedSelection:YES];
[self _setMagnifierEnabled:NO];
-
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
UITextWritingDirection writingDirection = UITextWritingDirectionLeftToRight;
// FIXME: retrieve from WebProcess writing direction.
_textAlignment = (writingDirection == UITextWritingDirectionLeftToRight) ? NSTextAlignmentLeft : NSTextAlignmentRight;
+ ALLOW_DEPRECATED_DECLARATIONS_END
[self setAllowsMultipleSelection:_allowsMultipleSelection];
[self setSize:[UIKeyboard defaultSizeForInterfaceOrientation:[UIApp interfaceOrientation]]];
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm (236980 => 236981)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm 2018-10-09 21:12:54 UTC (rev 236980)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm 2018-10-09 21:29:31 UTC (rev 236981)
@@ -47,6 +47,7 @@
- (CGRect)contentRectForBounds:(CGRect)bounds;
@end
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
static NSString *stringWithWritingDirection(NSString *string, UITextWritingDirection writingDirection, bool override)
{
if (![string length] || writingDirection == UITextWritingDirectionNatural)
@@ -73,6 +74,7 @@
return [NSString stringWithFormat:@"%C%@%C", directionalFormattingCharacter, string, popDirectionalFormatting];
}
+ALLOW_DEPRECATED_DECLARATIONS_END
@class WKSelectPopover;
@@ -122,7 +124,8 @@
}
currentIndex++;
}
-
+
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
UITextWritingDirection writingDirection = _contentView.assistedNodeInformation.isRTL ? UITextWritingDirectionRightToLeft : UITextWritingDirectionLeftToRight;
BOOL override = NO;
_textAlignment = (writingDirection == UITextWritingDirectionLeftToRight) ? NSTextAlignmentLeft : NSTextAlignmentRight;
@@ -133,7 +136,8 @@
if (writingDirection == UITextWritingDirectionRightToLeft)
self.view.semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
[self setTitle:stringWithWritingDirection(_contentView.assistedNodeInformation.title, writingDirection, override)];
-
+ ALLOW_DEPRECATED_DECLARATIONS_END
+
return self;
}
