Modified: trunk/Tools/ChangeLog (252448 => 252449)
--- trunk/Tools/ChangeLog 2019-11-14 04:04:17 UTC (rev 252448)
+++ trunk/Tools/ChangeLog 2019-11-14 04:40:23 UTC (rev 252449)
@@ -1,3 +1,20 @@
+2019-11-13 Megan Gardner <[email protected]>
+
+ Cleanup UIKitSPI for Testing
+ https://bugs.webkit.org/show_bug.cgi?id=204173
+
+ Reviewed by Simon Fraser.
+
+ Remove old staging for UIKit APIs that should not be needed now.
+
+ * TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/ios/UIPasteboardTests.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm:
+ (-[DragAndDropSimulator _concludeDropAndPerformOperationIfNecessary]):
+ * TestWebKitAPI/ios/UIKitSPI.h:
+
2019-11-13 Aakash Jain <[email protected]>
[ews] Add build step to Analyze JSC Tests Results
Modified: trunk/Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm (252448 => 252449)
--- trunk/Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm 2019-11-14 04:04:17 UTC (rev 252448)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm 2019-11-14 04:40:23 UTC (rev 252449)
@@ -565,7 +565,7 @@
}];
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 568)]);
- auto contentView = (id <UITextInputPrivate_Staging_54140418>)[webView textInputContentView];
+ auto contentView = (id <UITextInputPrivate>)[webView textInputContentView];
[webView synchronouslyLoadHTMLString:@"<input id='input'></input><div contenteditable id='editor'></div><textarea id='textarea'></textarea>"];
[webView _setInputDelegate:inputDelegate.get()];
Modified: trunk/Tools/TestWebKitAPI/Tests/ios/UIPasteboardTests.mm (252448 => 252449)
--- trunk/Tools/TestWebKitAPI/Tests/ios/UIPasteboardTests.mm 2019-11-14 04:04:17 UTC (rev 252448)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/UIPasteboardTests.mm 2019-11-14 04:40:23 UTC (rev 252449)
@@ -151,7 +151,7 @@
[UIPasteboard generalPasteboard].URL = "" URLWithString:@"https://www.apple.com/"];
bool done = false;
- [(id <UIWKInteractionViewProtocol_Staging_49236384>)[webView textInputContentView] pasteWithCompletionHandler:[webView, &done] {
+ [(id <UIWKInteractionViewProtocol>)[webView textInputContentView] pasteWithCompletionHandler:[webView, &done] {
[UIPasteboard generalPasteboard].items = @[ ];
done = true;
}];
Modified: trunk/Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm (252448 => 252449)
--- trunk/Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm 2019-11-14 04:04:17 UTC (rev 252448)
+++ trunk/Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm 2019-11-14 04:40:23 UTC (rev 252449)
@@ -496,7 +496,7 @@
defaultPreview = adoptNS([[UITargetedDragPreview alloc] initWithView:_webView.get()]);
}
- id <UIDropInteractionDelegate_Staging_31075005> delegate = (id <UIDropInteractionDelegate_Staging_31075005>)[_webView dropInteractionDelegate];
+ id <UIDropInteractionDelegate_Private> delegate = (id <UIDropInteractionDelegate_Private>)[_webView dropInteractionDelegate];
UIDropInteraction *interaction = [_webView dropInteraction];
[_dropPreviews addObject:[delegate dropInteraction:interaction previewForDroppingItem:item withDefault:defaultPreview.get()] ?: NSNull.null];
[_delayedDropPreviews addObject:NSNull.null];
Modified: trunk/Tools/TestWebKitAPI/ios/UIKitSPI.h (252448 => 252449)
--- trunk/Tools/TestWebKitAPI/ios/UIKitSPI.h 2019-11-14 04:04:17 UTC (rev 252448)
+++ trunk/Tools/TestWebKitAPI/ios/UIKitSPI.h 2019-11-14 04:40:23 UTC (rev 252449)
@@ -54,9 +54,10 @@
@class UIDragItem;
#import <UIKit/NSItemProvider+UIKitAdditions_Private.h>
#import <UIKit/UIDragInteraction_Private.h>
+#import <UIKit/UITextAutofillSuggestion.h>
#endif // PLATFORM(IOS)
-#else
+#else // USE(APPLE_INTERNAL_SDK)
WTF_EXTERN_C_BEGIN
@@ -87,6 +88,7 @@
@class UITextInputArrowKeyHistory;
@protocol UITextInputPrivate <UITextInput, UITextInputTraits_Private>
+@property (nonatomic, readonly) BOOL supportsImagePaste;
- (UITextInputTraits *)textInputTraits;
- (void)insertTextSuggestion:(UITextSuggestion *)textSuggestion;
- (void)handleKeyWebEvent:(WebEvent *)theEvent withCompletionHandler:(void (^)(WebEvent *, BOOL))completionHandler;
@@ -96,6 +98,7 @@
@end
@interface UIWebFormAccessory : UIInputView
+- (void)setNextPreviousItemsVisible:(BOOL)visible;
@end
@interface UIBarButtonItemGroup ()
@@ -109,6 +112,11 @@
- (void)_clearToken:(id <NSCopying, NSSecureCoding>)token;
@end
+@interface UITextAutofillSuggestion : UITextSuggestion
+@property (nonatomic, assign) NSString *username;
+@property (nonatomic, assign) NSString *password;
+@end
+
@interface NSURL ()
@property (nonatomic, copy, setter=_setTitle:) NSString *_title;
@end
@@ -143,13 +151,11 @@
};
@interface UIWKDocumentRequest : NSObject
-
@property (nonatomic, assign) UIWKDocumentRequestFlags flags;
@property (nonatomic, assign) UITextGranularity surroundingGranularity;
@property (nonatomic, assign) NSInteger granularityCount;
@property (nonatomic, assign) CGRect documentRect;
@property (nonatomic, retain) id <NSCopying> inputElementIdentifier;
-
@end
@interface UIWKAutocorrectionRects : NSObject
@@ -161,11 +167,16 @@
@end
@protocol UIWKInteractionViewProtocol
+- (void)pasteWithCompletionHandler:(void (^)(void))completionHandler;
- (void)requestAutocorrectionRectsForString:(NSString *)input withCompletionHandler:(void (^)(UIWKAutocorrectionRects *rectsForInput))completionHandler;
- (void)requestAutocorrectionContextWithCompletionHandler:(void (^)(UIWKAutocorrectionContext *autocorrectionContext))completionHandler;
@property (nonatomic, readonly) NSString *selectedText;
@end
+@interface UIViewController ()
++ (UIViewController *)_viewControllerForFullScreenPresentationFromView:(UIView *)view;
+@end
+
IGNORE_WARNINGS_BEGIN("deprecated-implementations")
@interface UIWebBrowserView : UIView <UIKeyInput>
@@ -181,30 +192,20 @@
@property (nonatomic, readonly) CGRect _referenceBounds;
@end
-#endif
+#endif // USE(APPLE_INTERNAL_SDK)
-#if __has_include(<UIKit/UITextAutofillSuggestion.h>)
-// FIXME: Move this import under USE(APPLE_INTERNAL_SDK) once <rdar://problem/34583628> lands in the SDK.
-#import <UIKit/UITextAutofillSuggestion.h>
@interface UITextAutofillSuggestion ()
+ (instancetype)autofillSuggestionWithUsername:(NSString *)username password:(NSString *)password;
@end
-#else
-@interface UITextAutofillSuggestion : UITextSuggestion
-@property (nonatomic, assign) NSString *username;
-@property (nonatomic, assign) NSString *password;
-+ (instancetype)autofillSuggestionWithUsername:(NSString *)username password:(NSString *)password;
+
+@protocol UIDropInteractionDelegate_Private <UIDropInteractionDelegate>
+- (void)_dropInteraction:(UIDropInteraction *)interaction delayedPreviewProviderForDroppingItem:(UIDragItem *)item previewProvider:(void(^)(UITargetedDragPreview *preview))previewProvider;
@end
-#endif
@interface NSURL (UIKitSPI)
@property (nonatomic, copy, setter=_setTitle:) NSString *_title;
@end
-@interface UIViewController (UIKitSPI)
-+ (UIViewController *)_viewControllerForFullScreenPresentationFromView:(UIView *)view;
-@end
-
@interface UIResponder (UIKitSPI)
- (UIResponder *)firstResponder;
- (void)makeTextWritingDirectionNatural:(id)sender;
@@ -214,24 +215,8 @@
+ (BOOL)isInHardwareKeyboardMode;
@end
-@protocol UIWKInteractionViewProtocol_Staging_49236384 <UIWKInteractionViewProtocol>
-- (void)pasteWithCompletionHandler:(void (^)(void))completionHandler;
-@end
-
-@protocol UITextInputPrivate_Staging_54140418 <UITextInputPrivate>
-@property (nonatomic, readonly) BOOL supportsImagePaste;
-@end
-
-@interface UIWebFormAccessory (Staging_49666643)
-- (void)setNextPreviousItemsVisible:(BOOL)visible;
-@end
-
#if PLATFORM(IOS)
-@protocol UIDropInteractionDelegate_Staging_31075005 <UIDropInteractionDelegate>
-- (void)_dropInteraction:(UIDropInteraction *)interaction delayedPreviewProviderForDroppingItem:(UIDragItem *)item previewProvider:(void(^)(UITargetedDragPreview *preview))previewProvider;
-@end
-
typedef NS_ENUM(NSUInteger, _UIClickInteractionEvent) {
_UIClickInteractionEventBegan = 0,
_UIClickInteractionEventClickedDown,
