Changeset 245283 in webkit

Timestamp:

May 14, 2019, 9:22:32 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[iOS] Cannot tab or shift + tab out of address bar on google.com
​https://bugs.webkit.org/show_bug.cgi?id=197859
<rdar://problem/46651565>

Patch by Daniel Bates <​dabates@apple.com> on 2019-05-14
Reviewed by Darin Adler.

Non-editable elements can participate in tab cycling via the HTML tabindex attribute.
We should allow setting the initial focus to such an element when transitioning from
the chrome (e.g. address bar) to the web page.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView _becomeFirstResponderWithSelectionMovingForward:completionHandler:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-14  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Cannot tab or shift + tab out of address bar on google.com
+        https://bugs.webkit.org/show_bug.cgi?id=197859
+        <rdar://problem/46651565>
+
+        Reviewed by Darin Adler.
+
+        Non-editable elements can participate in tab cycling via the HTML tabindex attribute.
+        We should allow setting the initial focus to such an element when transitioning from
+        the chrome (e.g. address bar) to the web page.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _becomeFirstResponderWithSelectionMovingForward:completionHandler:]):
+
 2019-05-14  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -3795 +3795 @@
 - (void)_becomeFirstResponderWithSelectionMovingForward:(BOOL)selectingForward completionHandler:(void (^)(BOOL didBecomeFirstResponder))completionHandler
 {
-    auto completionHandlerCopy = Block_copy(completionHandler);
-    RetainPtr<WKContentView> view = self;
-    _page->setInitialFocus(selectingForward, false, WebKit::WebKeyboardEvent(), [view, completionHandlerCopy](WebKit::CallbackBase::Error) {
-        BOOL didBecomeFirstResponder = view->_focusedElementInformation.elementType != WebKit::InputType::None && [view becomeFirstResponder];
-        completionHandlerCopy(didBecomeFirstResponder);
-        Block_release(completionHandlerCopy);
+    constexpr bool isKeyboardEventValid = false;
+    _page->setInitialFocus(selectingForward, isKeyboardEventValid, { }, [protectedSelf = retainPtr(self), completionHandler = makeBlockPtr(completionHandler)] (auto) {
+        completionHandler([protectedSelf becomeFirstResponder]);
     });
 }