Title: [186732] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 186732
- Author
- [email protected]
- Date
- 2015-07-12 00:23:30 -0700 (Sun, 12 Jul 2015)
Log Message
Merged r186716. rdar://problem/21507154
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (186731 => 186732)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-12 07:22:24 UTC (rev 186731)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-12 07:23:30 UTC (rev 186732)
@@ -1,5 +1,23 @@
2015-07-12 Babak Shafiei <[email protected]>
+ Merge r186716.
+
+ 2015-07-11 Enrica Casucci <[email protected]>
+
+ Remove incorrect overriding of inputAssistantItem in WKContentView.
+ https://bugs.webkit.org/show_bug.cgi?id=146863
+ rdar://problem/21507154
+
+ Reviewed by Sam Weinig.
+
+ Correction to the patch in r186713.
+ We need to provide the inputAssistantItem from the responder.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView inputAccessoryView]):
+
+2015-07-12 Babak Shafiei <[email protected]>
+
Merge r186713.
2015-07-10 Enrica Casucci <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (186731 => 186732)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-12 07:22:24 UTC (rev 186731)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-12 07:23:30 UTC (rev 186732)
@@ -211,6 +211,12 @@
+ (BOOL)_addCompletion:(void(^)(BOOL))completion;
@end
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+@interface UIWebFormAccessory (StagingToRemove)
+- (id)initWithInputAssistantItem:(UITextInputAssistantItem *)inputAssistantItem;
+@end
+#endif
+
@interface WKFormInputSession : NSObject <_WKFormInputSession>
- (instancetype)initWithContentView:(WKContentView *)view userObject:(NSObject <NSSecureCoding> *)userObject;
@@ -1251,7 +1257,12 @@
- (UIView *)inputAccessoryView
{
if (!_formAccessoryView) {
- _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] init]);
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+ if ([UIWebFormAccessory instancesRespondToSelector:@selector(initWithInputAssistantItem:)])
+ _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] initWithInputAssistantItem:[self inputAssistantItem]]);
+ else
+#endif
+ _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] init]);
[_formAccessoryView setDelegate:self];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
