Title: [223017] trunk/Source/WebKit
- Revision
- 223017
- Author
- [email protected]
- Date
- 2017-10-06 19:36:59 -0700 (Fri, 06 Oct 2017)
Log Message
[iOS WK2] API tests added in r222991 are failing in iOS 11 test runners
https://bugs.webkit.org/show_bug.cgi?id=178037
Reviewed by Tim Horton.
This patch carries out some minor cleanup around UIKitSPI.h in WebKit2, so that the internal SDK isn't required
to implement -[WKContentView insertTextSuggestion:].
* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView insertTextSuggestion:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (223016 => 223017)
--- trunk/Source/WebKit/ChangeLog 2017-10-07 02:33:26 UTC (rev 223016)
+++ trunk/Source/WebKit/ChangeLog 2017-10-07 02:36:59 UTC (rev 223017)
@@ -1,3 +1,17 @@
+2017-10-06 Wenson Hsieh <[email protected]>
+
+ [iOS WK2] API tests added in r222991 are failing in iOS 11 test runners
+ https://bugs.webkit.org/show_bug.cgi?id=178037
+
+ Reviewed by Tim Horton.
+
+ This patch carries out some minor cleanup around UIKitSPI.h in WebKit2, so that the internal SDK isn't required
+ to implement -[WKContentView insertTextSuggestion:].
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView insertTextSuggestion:]):
+
2017-10-06 Chris Dumez <[email protected]>
[Beacon][Cocoa] Beacon requests with BufferSource payload should not have a Content-Type HTTP header
Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (223016 => 223017)
--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2017-10-07 02:33:26 UTC (rev 223016)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2017-10-07 02:36:59 UTC (rev 223017)
@@ -43,17 +43,6 @@
#import <UIKit/UIInterface_Private.h>
#import <UIKit/UIKeyboardImpl.h>
#import <UIKit/UIKeyboardIntl.h>
-#if __has_include(<UIKit/UIKeyboardLoginCredentialsSuggestion.h>)
-#import <UIKit/UIKeyboardLoginCredentialsSuggestion.h>
-#else
-#import <UIKit/UITextInput_Private.h>
-@interface UIKeyboardLoginCredentialsSuggestion : UITextSuggestion
-
-@property (nonatomic, assign) NSString *username;
-@property (nonatomic, assign) NSString *password;
-
-@end
-#endif
#import <UIKit/UIKeyboard_Private.h>
#import <UIKit/UILongPressGestureRecognizer_Private.h>
#import <UIKit/UIPeripheralHost.h>
@@ -400,7 +389,8 @@
- (void)willStartScrollingOverflow;
@end
-@class UITextSuggestion;
+@interface UITextSuggestion : NSObject
+@end
@protocol UITextInputSuggestionDelegate <UITextInputDelegate>
- (void)setSuggestions:(NSArray <UITextSuggestion*> *)suggestions;
@@ -964,6 +954,15 @@
- (UIResponder *)firstResponder;
@end
+#if __has_include(<UIKit/UIKeyboardLoginCredentialsSuggestion.h>)
+#import <UIKit/UIKeyboardLoginCredentialsSuggestion.h>
+#else
+@interface UIKeyboardLoginCredentialsSuggestion : UITextSuggestion
+@property (nonatomic, assign) NSString *username;
+@property (nonatomic, assign) NSString *password;
+@end
+#endif
+
WTF_EXTERN_C_BEGIN
BOOL UIKeyboardEnabledInputModesAllowOneToManyShortcuts();
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (223016 => 223017)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2017-10-07 02:33:26 UTC (rev 223016)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2017-10-07 02:36:59 UTC (rev 223017)
@@ -2982,7 +2982,6 @@
[self.inputDelegate selectionDidChange:self];
}
-#if USE(APPLE_INTERNAL_SDK)
- (void)insertTextSuggestion:(UITextSuggestion *)textSuggestion
{
// FIXME: Replace NSClassFromString with actual class as soon as UIKit submitted the new class into the iOS SDK.
@@ -2994,7 +2993,6 @@
if ([inputDelegate respondsToSelector:@selector(_webView:insertTextSuggestion:inInputSession:)])
[inputDelegate _webView:_webView insertTextSuggestion:textSuggestion inInputSession:_formInputSession.get()];
}
-#endif // USE(APPLE_INTERNAL_SDK)
- (NSString *)textInRange:(UITextRange *)range
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes