Attachment 369519 Details for Bug 197746 – To Land

[patch] To Land

bug-197746-20190509131805.patch (text/plain), 4.11 KB, created by Daniel Bates on 2019-05-09 13:18:06 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2019-05-09 13:18:06 PDT

Size: 4.11 KB

patch

obsolete

>Subversion Revision: 244742
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f03e10731efc3db834e841e0dd3e15bd6a5675e1..80bc1b6b564570ad2e3bc625f15d67d27bd2de94 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,25 @@
>+2019-05-09  Daniel Bates  <dabates@apple.com>
>+
>+        [iOS] Lazily request keyboard on first hardware keydown when a non-editable element is focused
>+        https://bugs.webkit.org/show_bug.cgi?id=197746
>+        <rdar://problem/50630406>
>+
>+        Reviewed by Brent Fulgham.
>+
>+        Be even lazier. We only need to create a keyboard if an editable element is focused or on
>+        the first hardware keydown when a non-editable element is focused. We currently do the former.
>+        Let's also do the latter.
>+
>+        * UIProcess/ios/WKContentViewInteraction.h:
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        (-[WKContentView cleanupInteraction]): Reset bookkeeping.
>+        (-[WKContentView _requiresKeyboardWhenFirstResponder]): Further condition the result on
>+        whether we have seen a hardware keydown event in a non-editable element.
>+        (-[WKContentView _handleKeyUIEvent:]): If this is the first hardware key event we've seen then
>+        update state and call -reloadInputView. -reloadInputView will call us back in -_requiresKeyboardWhenFirstResponder
>+        and we will now return YES. So, it will create the keyboard.
>+        (-[WKContentView _hardwareKeyboardAvailabilityChanged]): Reset bookkeeping.
>+
> 2019-05-09  Daniel Bates  <dabates@apple.com>
> 
>         REGRESSION (r241734): 1% slower PLT on iPad
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>index 4aed1a8ca520ae3ec6a861c257cd336cf5a0868e..0164d2e3bcf3fe0b31302f15372b0a52753c6240 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>@@ -325,6 +325,7 @@ struct WKAutoCorrectionData {
> 
> #if USE(UIKIT_KEYBOARD_ADDITIONS)
>     BOOL _candidateViewNeedsUpdate;
>+    BOOL _seenHardwareKeyDownInNonEditableElement;
> #endif
> 
>     BOOL _becomingFirstResponder;
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index b6c4d8588d728e49aeb6c8c633b3c195980495af..db3ff0f13015233ad79ba145e2c43ddf94e2da29 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>@@ -835,6 +835,7 @@ - (void)cleanupInteraction
> 
> #if USE(UIKIT_KEYBOARD_ADDITIONS)
>     _candidateViewNeedsUpdate = NO;
>+    _seenHardwareKeyDownInNonEditableElement = NO;
> #endif
> 
>     if (_interactionViewsContainerView) {
>@@ -1646,14 +1647,12 @@ - (BOOL)_disableAutomaticKeyboardUI
> 
> - (BOOL)_requiresKeyboardWhenFirstResponder
> {
>-    // FIXME: Only create keyboard if [self shouldShowAutomaticKeyboardUI] returns YES or
>-    // on first hardware keydown in a non-editable element. See <https://bugs.webkit.org/show_bug.cgi?id=197746>.
>+    // FIXME: We should add the logic to handle keyboard visibility during focus redirects.
>+    return [self shouldShowAutomaticKeyboardUI]
> #if USE(UIKIT_KEYBOARD_ADDITIONS)
>-    if (GSEventIsHardwareKeyboardAttached())
>-        return YES;
>+        || _seenHardwareKeyDownInNonEditableElement
> #endif
>-    // FIXME: We should add the logic to handle keyboard visibility during focus redirects.
>-    return [self shouldShowAutomaticKeyboardUI];
>+        ;
> }
> 
> - (BOOL)_requiresKeyboardResetOnReload
>@@ -4460,6 +4459,10 @@ - (void)_handleKeyUIEvent:(::UIEvent *)event
>                 return;
>         }
> #if USE(UIKIT_KEYBOARD_ADDITIONS)
>+        if (!_seenHardwareKeyDownInNonEditableElement) {
>+            _seenHardwareKeyDownInNonEditableElement = YES;
>+            [self reloadInputViews];
>+        }
>         [super _handleKeyUIEvent:event];
> #else
>         [self handleKeyEvent:event];
>@@ -5184,6 +5187,9 @@ - (void)_elementDidBlur
> 
> - (void)_hardwareKeyboardAvailabilityChanged
> {
>+#if USE(UIKIT_KEYBOARD_ADDITIONS)
>+    _seenHardwareKeyDownInNonEditableElement = NO;
>+#endif
>     [self reloadInputViews];
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 197746: 369511 | 369512 | 369519