[iOS] Ignore some deprecated declarations
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Oct 2018 21:29:31 +0000 (21:29 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Oct 2018 21:29:31 +0000 (21:29 +0000)
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:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236981 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/ios/WKActionSheet.mm
Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm
Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm
Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm

index b3d7bcf..1c99a64 100644 (file)
@@ -1,3 +1,21 @@
+2018-10-09  Daniel Bates  <dabates@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  <csaavedra@igalia.com>
 
         [WPE] Explicitly link against gmodule where used
index 1b1c6b6..a8c6ca9 100644 (file)
 
     _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];
         [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;
 }
 {
     // 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];
index bb66347..f12e108 100644 (file)
@@ -248,11 +248,13 @@ static const CGFloat presentationElementRectPadding = 15;
 {
     // 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];
 }
index 18e1142..b89b125 100644 (file)
@@ -3467,6 +3467,7 @@ static void selectionChangedWithTouch(WKContentView *view, const WebCore::IntPoi
     return nil;
 }
 
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
 - (UITextWritingDirection)baseWritingDirectionForPosition:(UITextPosition *)position inDirection:(UITextStorageDirection)direction
 {
     return UITextWritingDirectionLeftToRight;
@@ -3475,6 +3476,7 @@ static void selectionChangedWithTouch(WKContentView *view, const WebCore::IntPoi
 - (void)setBaseWritingDirection:(UITextWritingDirection)writingDirection forRange:(UITextRange *)range
 {
 }
+ALLOW_DEPRECATED_DECLARATIONS_END
 
 - (CGRect)firstRectForRange:(UITextRange *)range
 {
@@ -6531,10 +6533,12 @@ static NSString *previewIdentifierForElementAction(_WKElementAction *action)
     return _webRect.rect;
 }
 
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
 - (UITextWritingDirection)writingDirection
 {
     return (UITextWritingDirection)_webRect.writingDirection;
 }
+ALLOW_DEPRECATED_DECLARATIONS_END
 
 - (UITextRange *)range
 {
index 2ed1240..3ca9449 100644 (file)
@@ -154,10 +154,11 @@ static const float GroupOptionTextColorAlpha = 0.5;
     [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]]];
index 43b7ecb..99c84e8 100644 (file)
@@ -47,6 +47,7 @@ static NSString* WKPopoverTableViewCellReuseIdentifier  = @"WKPopoverTableViewCe
 - (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 @@ static NSString *stringWithWritingDirection(NSString *string, UITextWritingDirec
     
     return [NSString stringWithFormat:@"%C%@%C", directionalFormattingCharacter, string, popDirectionalFormatting];
 }
+ALLOW_DEPRECATED_DECLARATIONS_END
 
 @class WKSelectPopover;
 
@@ -122,7 +124,8 @@ static NSString *stringWithWritingDirection(NSString *string, UITextWritingDirec
         }
         currentIndex++;
     }
-    
+
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     UITextWritingDirection writingDirection = _contentView.assistedNodeInformation.isRTL ? UITextWritingDirectionRightToLeft : UITextWritingDirectionLeftToRight;
     BOOL override = NO;
     _textAlignment = (writingDirection == UITextWritingDirectionLeftToRight) ? NSTextAlignmentLeft : NSTextAlignmentRight;
@@ -133,7 +136,8 @@ static NSString *stringWithWritingDirection(NSString *string, UITextWritingDirec
     if (writingDirection == UITextWritingDirectionRightToLeft)
         self.view.semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
     [self setTitle:stringWithWritingDirection(_contentView.assistedNodeInformation.title, writingDirection, override)];
-    
+    ALLOW_DEPRECATED_DECLARATIONS_END
+
     return self;
 }