Title: [245714] branches/safari-608.1.24.20-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
- Revision
- 245714
- Author
- [email protected]
- Date
- 2019-05-23 14:08:54 -0700 (Thu, 23 May 2019)
Log Message
Fix incorrect merge conflict resolution. rdar://problem/50613388
Modified Paths
Diff
Modified: branches/safari-608.1.24.20-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (245713 => 245714)
--- branches/safari-608.1.24.20-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-05-23 21:06:56 UTC (rev 245713)
+++ branches/safari-608.1.24.20-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-05-23 21:08:54 UTC (rev 245714)
@@ -1669,14 +1669,12 @@
- (BOOL)_requiresKeyboardWhenFirstResponder
{
- // FIXME: We should add the logic to handle keyboard visibility during focus redirects.
- return [self _shouldShowAutomaticKeyboardUIIgnoringInputMode];
#if USE(UIKIT_KEYBOARD_ADDITIONS)
if (GSEventIsHardwareKeyboardAttached())
return YES;
#endif
// FIXME: We should add the logic to handle keyboard visibility during focus redirects.
- return [self shouldShowAutomaticKeyboardUI];
+ return [self _shouldShowAutomaticKeyboardUIIgnoringInputMode];
}
- (BOOL)_requiresKeyboardResetOnReload
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
