Title: [186713] trunk/Source/WebKit2
- Revision
- 186713
- Author
- [email protected]
- Date
- 2015-07-11 12:02:25 -0700 (Sat, 11 Jul 2015)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186712 => 186713)
--- trunk/Source/WebKit2/ChangeLog 2015-07-11 18:19:46 UTC (rev 186712)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-11 19:02:25 UTC (rev 186713)
@@ -1,3 +1,20 @@
+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 Simon Fraser <[email protected]>
[iOS WK2] Scrolling issues on horizontally scrollable RTL pages
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (186712 => 186713)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-11 18:19:46 UTC (rev 186712)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-11 19:02:25 UTC (rev 186713)
@@ -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
