Changeset 249051 in webkit

Timestamp:

Aug 23, 2019 10:15:42 AM (5 years ago)

Author:

russell_e@apple.com

Message:

Unreviewed, rolling out r249031.

Causes multiple test failures on iOS simulator

Reverted changeset:

"[iOS] Should show input view when became first responder if
keyboard was showing when the view was resigned"
​https://bugs.webkit.org/show_bug.cgi?id=200902
​https://trac.webkit.org/changeset/249031

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/ios/resources/check-keyboard-on-screen.js (deleted)
• LayoutTests/fast/events/ios/should-not-show-keyboard-for-autofocused-field-when-becoming-first-responder-after-navigation-expected.txt (deleted)
• LayoutTests/fast/events/ios/should-not-show-keyboard-for-autofocused-field-when-becoming-first-responder-after-navigation.html (deleted)
• LayoutTests/fast/events/ios/show-keyboard-when-becoming-first-responder-despite-inputmode-none-expected.txt (deleted)
• LayoutTests/fast/events/ios/show-keyboard-when-becoming-first-responder-despite-inputmode-none.html (deleted)
• LayoutTests/fast/events/ios/show-keyboard-when-becoming-first-responder-expected.txt (deleted)
• LayoutTests/fast/events/ios/show-keyboard-when-becoming-first-responder.html (deleted)
• LayoutTests/resources/ui-helper.js (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/PageClient.h (modified) (1 diff)
• Source/WebKit/UIProcess/WebPageProxy.h (modified) (1 diff)
• Source/WebKit/UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• Source/WebKit/UIProcess/ios/PageClientImplIOS.h (modified) (1 diff)
• Source/WebKit/UIProcess/ios/PageClientImplIOS.mm (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (modified) (2 diffs)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (9 diffs)
• Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (modified) (3 diffs)
• Source/WebKit/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-08-23  Russell Epstein  <repstein@apple.com>
+
+        Unreviewed, rolling out r249031.
+
+        Causes multiple test failures on iOS simulator
+
+        Reverted changeset:
+
+        "[iOS] Should show input view when became first responder if
+        keyboard was showing when the view was resigned"
+        https://bugs.webkit.org/show_bug.cgi?id=200902
+        https://trac.webkit.org/changeset/249031
+
 2019-08-23  Megan Gardner  <megan_gardner@apple.com>
 

trunk/LayoutTests/resources/ui-helper.js

@@ -507 +507 @@
     }
 
-    static waitForKeyboardToShow()
-    {
-        if (!this.isWebKit2() || !this.isIOSFamily())
-            return Promise.resolve();
-
-        return new Promise(resolve => {
-            testRunner.runUIScript(`
-                (function() {
-                    if (uiController.isShowingKeyboard)
-                        uiController.uiScriptComplete();
-                    else
-                        uiController.didShowKeyboardCallback = () => uiController.uiScriptComplete();
-                })()`, resolve);
-        });
-    }
-
     static getUICaretRect()
     {
@@ -806 +790 @@
 
         return new Promise(resolve => testRunner.runUIScript(`uiController.resignFirstResponder()`, resolve));
-    }
-
-    static becomeFirstResponder()
-    {
-        if (!this.isWebKit2())
-            return Promise.resolve();
-
-        return new Promise(resolve => testRunner.runUIScript(`uiController.becomeFirstResponder()`, resolve));
     }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-23  Russell Epstein  <repstein@apple.com>
+
+        Unreviewed, rolling out r249031.
+
+        Causes multiple test failures on iOS simulator
+
+        Reverted changeset:
+
+        "[iOS] Should show input view when became first responder if
+        keyboard was showing when the view was resigned"
+        https://bugs.webkit.org/show_bug.cgi?id=200902
+        https://trac.webkit.org/changeset/249031
+
 2019-08-22  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKit/UIProcess/PageClient.h

@@ -389 +389 @@
     virtual void updateInputContextAfterBlurringAndRefocusingElement() = 0;
     virtual void elementDidBlur() = 0;
-    virtual void focusedElementDidChangeInputMode(WebCore::InputMode, OptionSet<WebCore::ActivityState::Flag>) = 0;
+    virtual void focusedElementDidChangeInputMode(WebCore::InputMode) = 0;
     virtual void didReceiveEditorStateUpdateAfterFocus() = 0;
     virtual bool isFocusingElement() = 0;

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -1946 +1946 @@
     void elementDidBlur();
     void updateInputContextAfterBlurringAndRefocusingElement();
-    void focusedElementDidChangeInputMode(WebCore::InputMode, OptionSet<WebCore::ActivityState::Flag>);
+    void focusedElementDidChangeInputMode(WebCore::InputMode);
     void didReleaseAllTouchPoints();
     void didReceiveEditorStateUpdateAfterFocus();

trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in

@@ -410 +410 @@
     ElementDidBlur()
     UpdateInputContextAfterBlurringAndRefocusingElement()
-    FocusedElementDidChangeInputMode(enum:uint8_t WebCore::InputMode mode, OptionSet<WebCore::ActivityState::Flag> activityStateChanges)
+    FocusedElementDidChangeInputMode(enum:uint8_t WebCore::InputMode mode)
     ScrollingNodeScrollWillStartScroll()
     ScrollingNodeScrollDidEndScroll()

trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h

@@ -152 +152 @@
     void updateInputContextAfterBlurringAndRefocusingElement() final;
     void elementDidBlur() override;
-    void focusedElementDidChangeInputMode(WebCore::InputMode, OptionSet<WebCore::ActivityState::Flag>) override;
+    void focusedElementDidChangeInputMode(WebCore::InputMode) override;
     void didReceiveEditorStateUpdateAfterFocus() override;
     bool isFocusingElement() override;

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

@@ -574 +574 @@
 }
 
-void PageClientImpl::focusedElementDidChangeInputMode(WebCore::InputMode mode, OptionSet<WebCore::ActivityState::Flag> activityStateChanges)
-{
-    [m_contentView _didUpdateInputMode:mode activityStateChanges:activityStateChanges];
+void PageClientImpl::focusedElementDidChangeInputMode(WebCore::InputMode mode)
+{
+    [m_contentView _didUpdateInputMode:mode];
 }
 

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

@@ -338 +338 @@
 
     BOOL _keyboardDidRequestDismissal;
-    BOOL _wasResignedWhileShowingInputView;
-    BOOL _shouldShowAutomaticKeyboardUIWhenInputModeNone;
 
 #if USE(UIKIT_KEYBOARD_ADDITIONS)
@@ -465 +463 @@
 - (void)_elementDidBlur;
 - (void)_hideContextMenuHintContainer;
-- (void)_didUpdateInputMode:(WebCore::InputMode)mode activityStateChanges:(OptionSet<WebCore::ActivityState::Flag>)activityStateChanges;
+- (void)_didUpdateInputMode:(WebCore::InputMode)mode;
 - (void)_didReceiveEditorStateUpdateAfterFocus;
 - (void)_hardwareKeyboardAvailabilityChanged;

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

@@ -944 +944 @@
     [self _resetInputViewDeferral];
     _focusedElementInformation = { };
-    _wasResignedWhileShowingInputView = NO;
     
     [_keyboardScrollingAnimator invalidate];
@@ -1263 +1262 @@
     SetForScope<BOOL> resigningFirstResponderScope { _resigningFirstResponder, YES };
 
-    BOOL wasKeyboardOnScreen = UIPeripheralHost.activeInstance.isOnScreen;
-    [self endEditingAndUpdateFocusAppearanceWithReason:EndEditingReasonResigningFirstResponder]; // May dismiss the keyboard.
+    [self endEditingAndUpdateFocusAppearanceWithReason:EndEditingReasonResigningFirstResponder];
 
     // If the user explicitly dismissed the keyboard then we will lose first responder
@@ -1276 +1274 @@
 
     if (superDidResign) {
-        _wasResignedWhileShowingInputView = wasKeyboardOnScreen;
         [self _handleDOMPasteRequestWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
         _page->activityStateDidChange(WebCore::ActivityState::IsFocused);
@@ -1708 +1705 @@
     // We currently refrain from doing so because that would prevent UIKit from showing
     // the language picker when pressing the globe key to change the input language.
-    if (_focusedElementInformation.inputMode == WebCore::InputMode::None && !GSEventIsHardwareKeyboardAttached() && !_shouldShowAutomaticKeyboardUIWhenInputModeNone)
+    if (_focusedElementInformation.inputMode == WebCore::InputMode::None && !GSEventIsHardwareKeyboardAttached())
         return NO;
 
@@ -3979 +3976 @@
     _seenHardwareKeyDownInNonEditableElement = NO;
 #endif
-    _wasResignedWhileShowingInputView = NO;
     [self _elementDidBlur];
     [self _cancelLongPressGestureRecognizer];
@@ -5277 +5273 @@
 }
 
-- (BOOL)isFirstResponderOrBecomingFirstResponder
-{
-    return self.isFirstResponder || _becomingFirstResponder;
-}
-
-- (BOOL)shouldShowInputViewOnPageActivation:(const OptionSet<WebCore::ActivityState::Flag> &)activityStateChanges
-{
-    return [self isFirstResponderOrBecomingFirstResponder] && activityStateChanges.contains(WebCore::ActivityState::IsFocused) && _wasResignedWhileShowingInputView;
-}
-
 - (void)_elementDidFocus:(const WebKit::FocusedElementInformation&)information userIsInteracting:(BOOL)userIsInteracting blurPreviousNode:(BOOL)blurPreviousNode activityStateChanges:(OptionSet<WebCore::ActivityState::Flag>)activityStateChanges userObject:(NSObject <NSSecureCoding> *)userObject
 {
@@ -5310 +5296 @@
     if ([inputDelegate respondsToSelector:@selector(_webView:decidePolicyForFocusedElement:)])
         startInputSessionPolicy = [inputDelegate _webView:_webView decidePolicyForFocusedElement:focusedElementInfo.get()];
-
-    SetForScope<BOOL> shouldShowAutomaticKeyboardUIWhenInputModeNoneScope { _shouldShowAutomaticKeyboardUIWhenInputModeNone, startInputSessionPolicy == _WKFocusStartsInputSessionPolicyAuto && [self shouldShowInputViewOnPageActivation:activityStateChanges] };
 
     BOOL shouldShowInputView = [&] {
@@ -5321 +5305 @@
                 return YES;
 
-            if ([self isFirstResponderOrBecomingFirstResponder]) {
-                if (_shouldShowAutomaticKeyboardUIWhenInputModeNone)
+            if (self.isFirstResponder || _becomingFirstResponder) {
+                // When the software keyboard is being used to enter an url, only the focus activity state is changing.
+                // In this case, auto focus on the page being navigated to should be disabled, unless a hardware
+                // keyboard is attached.
+                if (activityStateChanges && activityStateChanges != WebCore::ActivityState::IsFocused)
                     return YES;
 
@@ -5536 +5523 @@
 }
 
-- (void)_didUpdateInputMode:(WebCore::InputMode)mode activityStateChanges:(OptionSet<WebCore::ActivityState::Flag>)activityStateChanges
-{
-    if (!self.inputDelegate || !hasFocusedElement(_focusedElementInformation))
+- (void)_didUpdateInputMode:(WebCore::InputMode)mode
+{
+    if (!self.inputDelegate || _focusedElementInformation.elementType == WebKit::InputType::None)
         return;
 
 #if !PLATFORM(WATCHOS)
-    SetForScope<BOOL> shouldShowAutomaticKeyboardUIWhenInputModeNoneScope { _shouldShowAutomaticKeyboardUIWhenInputModeNone, [self shouldShowInputViewOnPageActivation:activityStateChanges] };
     _focusedElementInformation.inputMode = mode;
     [self reloadInputViews];

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

@@ -933 +933 @@
 }
 
-void WebPageProxy::focusedElementDidChangeInputMode(WebCore::InputMode mode, OptionSet<WebCore::ActivityState::Flag> activityStateChanges)
+void WebPageProxy::focusedElementDidChangeInputMode(WebCore::InputMode mode)
 {
 #if ENABLE(TOUCH_EVENTS)
@@ -942 +942 @@
 #endif
 
-    pageClient().focusedElementDidChangeInputMode(mode, activityStateChanges);
+    pageClient().focusedElementDidChangeInputMode(mode);
 }
 
@@ -950 +950 @@
         return;
 
-    pageClient().focusedElementDidChangeInputMode(*m_pendingInputModeChange, { });
+    pageClient().focusedElementDidChangeInputMode(*m_pendingInputModeChange);
     m_pendingInputModeChange = WTF::nullopt;
 }

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -5536 +5536 @@
         return;
 
-    send(Messages::WebPageProxy::FocusedElementDidChangeInputMode(mode, m_lastActivityStateChanges));
+    send(Messages::WebPageProxy::FocusedElementDidChangeInputMode(mode));
 #else
     UNUSED_PARAM(mode);