Title: [186731] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 186731
- Author
- [email protected]
- Date
- 2015-07-12 00:22:24 -0700 (Sun, 12 Jul 2015)
Log Message
Merged r186713. rdar://problem/21507154
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (186730 => 186731)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-12 07:15:13 UTC (rev 186730)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-12 07:22:24 UTC (rev 186731)
@@ -1,3 +1,24 @@
+2015-07-12 Babak Shafiei <[email protected]>
+
+ Merge r186713.
+
+ 2015-07-10 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 Dan Bernstein.
+
+ Removing implementation of inputAssistantItem and moving initialization
+ of formAccessoryView to inputAccessoryView to avoid interfering with
+ the keyboard handling of the assistant bar.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView inputAccessoryView]):
+ (-[WKContentView inputAssistantItem]): Deleted.
+ (-[WKContentView _inputAssistantItem]): Deleted.
+
2015-07-10 Matthew Hanson <[email protected]>
Disable non-shipping features.
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (186730 => 186731)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-12 07:15:13 UTC (rev 186730)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-12 07:22:24 UTC (rev 186731)
@@ -211,12 +211,6 @@
+ (BOOL)_addCompletion:(void(^)(BOOL))completion;
@end
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
-@interface UIWebFormAccessory (StagingToRemove)
-- (UITextInputAssistantItem *)inputAssistantItem;
-@end
-#endif
-
@interface WKFormInputSession : NSObject <_WKFormInputSession>
- (instancetype)initWithContentView:(WKContentView *)view userObject:(NSObject <NSSecureCoding> *)userObject;
@@ -1256,33 +1250,17 @@
- (UIView *)inputAccessoryView
{
- if (![self requiresAccessoryView])
- return nil;
-
if (!_formAccessoryView) {
_formAccessoryView = adoptNS([[UIWebFormAccessory alloc] init]);
[_formAccessoryView setDelegate:self];
}
+
+ if (![self requiresAccessoryView])
+ return nil;
return _formAccessoryView.get();
}
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
-- (UITextInputAssistantItem *)inputAssistantItem
-{
- if (!_formAccessoryView) {
- _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] init]);
- [_formAccessoryView setDelegate:self];
- }
- return ([_formAccessoryView respondsToSelector:@selector(inputAssistantItem)]) ? [_formAccessoryView inputAssistantItem] : nil;
-}
-
-- (UITextInputAssistantItem *)_inputAssistantItem
-{
- return [self inputAssistantItem];
-}
-#endif
-
- (NSArray *)supportedPasteboardTypesForCurrentSelection
{
if (_page->editorState().selectionIsNone)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
