Changeset 245661 in webkit

Timestamp:

May 22, 2019, 5:30:23 PM (7 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION(r245148): Removing inputmode="none" does not bring up software keyboard
​https://bugs.webkit.org/show_bug.cgi?id=198141

Reviewed by Geoffrey Garen.

Source/WebKit:

r245148 changed _requiresKeyboardWhenFirstResponder to return NO when shouldShowAutomaticKeyboardUI
returns NO with regards to software keyboard. This introduced a regression that removing inputmode="none"
no longer brings up the software keyboard. Fixed the bug by making it return YES when inputmode="none"
is present on an editable element in shouldShowAutomaticKeyboardUI, partially restoring the old behavior.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView shouldShowAutomaticKeyboardUI]):
(-[WKContentView _shouldShowAutomaticKeyboardUIIgnoringInputMode]):
(-[WKContentView _requiresKeyboardWhenFirstResponder]):

LayoutTests:

Added a regression test.

• fast/forms/ios/inputmode-removing-none-expected.txt: Added.
• fast/forms/ios/inputmode-removing-none.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/ios/inputmode-removing-none-expected.txt (added)
• LayoutTests/fast/forms/ios/inputmode-removing-none.html (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-22  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r245148): Removing inputmode="none" does not bring up software keyboard
+        https://bugs.webkit.org/show_bug.cgi?id=198141
+
+        Reviewed by Geoffrey Garen.
+
+        Added a regression test.
+
+        * fast/forms/ios/inputmode-removing-none-expected.txt: Added.
+        * fast/forms/ios/inputmode-removing-none.html: Added.
+
 2019-05-22  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-22  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r245148): Removing inputmode="none" does not bring up software keyboard
+        https://bugs.webkit.org/show_bug.cgi?id=198141
+
+        Reviewed by Geoffrey Garen.
+
+        r245148 changed _requiresKeyboardWhenFirstResponder to return NO when shouldShowAutomaticKeyboardUI
+        returns NO with regards to software keyboard. This introduced a regression that removing inputmode="none"
+        no longer brings up the software keyboard. Fixed the bug by making it return YES when inputmode="none"
+        is present on an editable element in shouldShowAutomaticKeyboardUI, partially restoring the old behavior.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView shouldShowAutomaticKeyboardUI]):
+        (-[WKContentView _shouldShowAutomaticKeyboardUIIgnoringInputMode]):
+        (-[WKContentView _requiresKeyboardWhenFirstResponder]):
+
 2019-05-22  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -1641 +1641 @@
         return NO;
 
+    return [self _shouldShowAutomaticKeyboardUIIgnoringInputMode];
+}
+
+- (BOOL)_shouldShowAutomaticKeyboardUIIgnoringInputMode
+{
     switch (_focusedElementInformation.elementType) {
     case WebKit::InputType::None:
@@ -1672 +1677 @@
 {
     // FIXME: We should add the logic to handle keyboard visibility during focus redirects.
-    return [self shouldShowAutomaticKeyboardUI]
+    return [self _shouldShowAutomaticKeyboardUIIgnoringInputMode]
 #if USE(UIKIT_KEYBOARD_ADDITIONS)
         || _seenHardwareKeyDownInNonEditableElement