Changeset 245714 in webkit

Timestamp:

May 23, 2019, 2:08:54 PM (7 years ago)

Author:

Alan Coon

Message:

Fix incorrect merge conflict resolution. rdar://problem/50613388

File:

• branches/safari-608.1.24.20-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)

branches/safari-608.1.24.20-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -1670 +1670 @@
 - (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())
@@ -1677 +1675 @@
 #endif
     // FIXME: We should add the logic to handle keyboard visibility during focus redirects.
-    return [self shouldShowAutomaticKeyboardUI];
+    return [self _shouldShowAutomaticKeyboardUIIgnoringInputMode];
 }