⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 252449 in webkit


Ignore:
Timestamp:
Nov 13, 2019, 8:40:23 PM (7 years ago)
Author:
Megan Gardner
Message:

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:
Location:
trunk/Tools
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r252446 r252449  
     12019-11-13  Megan Gardner  <megan_gardner@apple.com>
     2
     3        Cleanup UIKitSPI for Testing
     4        https://bugs.webkit.org/show_bug.cgi?id=204173
     5
     6        Reviewed by Simon Fraser.
     7
     8        Remove old staging for UIKit APIs that should not be needed now.
     9
     10        * TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm:
     11        (TestWebKitAPI::TEST):
     12        * TestWebKitAPI/Tests/ios/UIPasteboardTests.mm:
     13        (TestWebKitAPI::TEST):
     14        * TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm:
     15        (-[DragAndDropSimulator _concludeDropAndPerformOperationIfNecessary]):
     16        * TestWebKitAPI/ios/UIKitSPI.h:
     17
    1182019-11-13  Aakash Jain  <aakash_jain@apple.com>
    219

  • trunk/Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm

    r248496 r252449  
    566566
    567567    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 568)]);
    568     auto contentView = (id <UITextInputPrivate_Staging_54140418>)[webView textInputContentView];
     568    auto contentView = (id <UITextInputPrivate>)[webView textInputContentView];
    569569    [webView synchronouslyLoadHTMLString:@"<input id='input'></input><div contenteditable id='editor'></div><textarea id='textarea'></textarea>"];
    570570    [webView _setInputDelegate:inputDelegate.get()];

  • trunk/Tools/TestWebKitAPI/Tests/ios/UIPasteboardTests.mm

    r245637 r252449  
    152152
    153153    bool done = false;
    154     [(id <UIWKInteractionViewProtocol_Staging_49236384>)[webView textInputContentView] pasteWithCompletionHandler:[webView, &done] {
     154    [(id <UIWKInteractionViewProtocol>)[webView textInputContentView] pasteWithCompletionHandler:[webView, &done] {
    155155        [UIPasteboard generalPasteboard].items = @[ ];
    156156        done = true;

  • trunk/Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm

    r251941 r252449  
    497497            }
    498498
    499             id <UIDropInteractionDelegate_Staging_31075005> delegate = (id <UIDropInteractionDelegate_Staging_31075005>)[_webView dropInteractionDelegate];
     499            id <UIDropInteractionDelegate_Private> delegate = (id <UIDropInteractionDelegate_Private>)[_webView dropInteractionDelegate];
    500500            UIDropInteraction *interaction = [_webView dropInteraction];
    501501            [_dropPreviews addObject:[delegate dropInteraction:interaction previewForDroppingItem:item withDefault:defaultPreview.get()] ?: NSNull.null];

  • trunk/Tools/TestWebKitAPI/ios/UIKitSPI.h

    r249514 r252449  
    5555#import <UIKit/NSItemProvider+UIKitAdditions_Private.h>
    5656#import <UIKit/UIDragInteraction_Private.h>
     57#import <UIKit/UITextAutofillSuggestion.h>
    5758#endif // PLATFORM(IOS)
    5859
    59 #else
     60#else // USE(APPLE_INTERNAL_SDK)
    6061
    6162WTF_EXTERN_C_BEGIN
    … …  
    8889
    8990@protocol UITextInputPrivate <UITextInput, UITextInputTraits_Private>
     91@property (nonatomic, readonly) BOOL supportsImagePaste;
    9092- (UITextInputTraits *)textInputTraits;
    9193- (void)insertTextSuggestion:(UITextSuggestion *)textSuggestion;
    … …  
    9799
    98100@interface UIWebFormAccessory : UIInputView
     101- (void)setNextPreviousItemsVisible:(BOOL)visible;
    99102@end
    100103
    … …  
    108111- (BOOL)_restoreFocusWithToken:(id <NSCopying, NSSecureCoding>)token;
    109112- (void)_clearToken:(id <NSCopying, NSSecureCoding>)token;
     113@end
     114
     115@interface UITextAutofillSuggestion : UITextSuggestion
     116@property (nonatomic, assign) NSString *username;
     117@property (nonatomic, assign) NSString *password;
    110118@end
    111119
    … …  
    144152
    145153@interface UIWKDocumentRequest : NSObject
    146 
    147154@property (nonatomic, assign) UIWKDocumentRequestFlags flags;
    148155@property (nonatomic, assign) UITextGranularity surroundingGranularity;
    … …  
    150157@property (nonatomic, assign) CGRect documentRect;
    151158@property (nonatomic, retain) id <NSCopying> inputElementIdentifier;
    152 
    153159@end
    154160
    … …  
    162168
    163169@protocol UIWKInteractionViewProtocol
     170- (void)pasteWithCompletionHandler:(void (^)(void))completionHandler;
    164171- (void)requestAutocorrectionRectsForString:(NSString *)input withCompletionHandler:(void (^)(UIWKAutocorrectionRects *rectsForInput))completionHandler;
    165172- (void)requestAutocorrectionContextWithCompletionHandler:(void (^)(UIWKAutocorrectionContext *autocorrectionContext))completionHandler;
    … …  
    167174@end
    168175
     176@interface UIViewController ()
     177+ (UIViewController *)_viewControllerForFullScreenPresentationFromView:(UIView *)view;
     178@end
     179
    169180IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    170181
    … …  
    182193@end
    183194
    184 #endif
    185 
    186 #if __has_include(<UIKit/UITextAutofillSuggestion.h>)
    187 // FIXME: Move this import under USE(APPLE_INTERNAL_SDK) once <rdar://problem/34583628> lands in the SDK.
    188 #import <UIKit/UITextAutofillSuggestion.h>
     195#endif // USE(APPLE_INTERNAL_SDK)
     196
    189197@interface UITextAutofillSuggestion ()
    190198+ (instancetype)autofillSuggestionWithUsername:(NSString *)username password:(NSString *)password;
    191199@end
    192 #else
    193 @interface UITextAutofillSuggestion : UITextSuggestion
    194 @property (nonatomic, assign) NSString *username;
    195 @property (nonatomic, assign) NSString *password;
    196 + (instancetype)autofillSuggestionWithUsername:(NSString *)username password:(NSString *)password;
    197 @end
    198 #endif
     200
     201@protocol UIDropInteractionDelegate_Private <UIDropInteractionDelegate>
     202- (void)_dropInteraction:(UIDropInteraction *)interaction delayedPreviewProviderForDroppingItem:(UIDragItem *)item previewProvider:(void(^)(UITargetedDragPreview *preview))previewProvider;
     203@end
    199204
    200205@interface NSURL (UIKitSPI)
    201206@property (nonatomic, copy, setter=_setTitle:) NSString *_title;
    202 @end
    203 
    204 @interface UIViewController (UIKitSPI)
    205 + (UIViewController *)_viewControllerForFullScreenPresentationFromView:(UIView *)view;
    206207@end
    207208
    … …  
    215216@end
    216217
    217 @protocol UIWKInteractionViewProtocol_Staging_49236384 <UIWKInteractionViewProtocol>
    218 - (void)pasteWithCompletionHandler:(void (^)(void))completionHandler;
    219 @end
    220 
    221 @protocol UITextInputPrivate_Staging_54140418 <UITextInputPrivate>
    222 @property (nonatomic, readonly) BOOL supportsImagePaste;
    223 @end
    224 
    225 @interface UIWebFormAccessory (Staging_49666643)
    226 - (void)setNextPreviousItemsVisible:(BOOL)visible;
    227 @end
    228 
    229218#if PLATFORM(IOS)
    230 
    231 @protocol UIDropInteractionDelegate_Staging_31075005 <UIDropInteractionDelegate>
    232 - (void)_dropInteraction:(UIDropInteraction *)interaction delayedPreviewProviderForDroppingItem:(UIDragItem *)item previewProvider:(void(^)(UITargetedDragPreview *preview))previewProvider;
    233 @end
    234219
    235220typedef NS_ENUM(NSUInteger, _UIClickInteractionEvent) {
Note: See TracChangeset for help on using the changeset viewer.