Changeset 227710 in webkit

Timestamp:

Jan 26, 2018 6:13:48 PM (6 years ago)

Author:

Megan Gardner

Message:

Don't retain focus for input peripheral views
​https://bugs.webkit.org/show_bug.cgi?id=182204

Reviewed by Tim Horton.

Source/WebKit:

Retaining focus on input peripheral views makes it so they cannot dismiss themselves with
the current architecture. This should probably be fixed in UIKit, as there is no reason for
focus to be retained on these views anyways, as they don't have keyboard input, but this
guards against over-aggressive retain requests.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView _restoreFocusWithToken:]):
(-[WKContentView _preserveFocusWithToken:destructively:]):

LayoutTests:

Fixed a spelling error while fixing a bug this test caught.

• fast/forms/ios/ipad/unfocus-inside-fixed-hittest.html:
• fast/forms/ios/ipad/unfocus-inside-fixed-hittest-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/ios/ipad/unfocus-inside-fixed-hittest-expected.txt (modified) (1 diff)
• LayoutTests/fast/forms/ios/ipad/unfocus-inside-fixed-hittest.html (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-01-26  Megan Gardner  <megan_gardner@apple.com>
+
+        Don't retain focus for input peripheral views
+        https://bugs.webkit.org/show_bug.cgi?id=182204
+
+        Reviewed by Tim Horton.
+
+        Fixed a spelling error while fixing a bug this test caught.
+
+        * fast/forms/ios/ipad/unfocus-inside-fixed-hittest.html:
+        * fast/forms/ios/ipad/unfocus-inside-fixed-hittest-expected.txt:
+
 2018-01-26  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/fast/forms/ios/ipad/unfocus-inside-fixed-hittest-expected.txt

@@ -3 +3 @@
 Click Me
 June
-PASS: hit testing found #target after select interation
+PASS: hit testing found #target after select interaction

trunk/LayoutTests/fast/forms/ios/ipad/unfocus-inside-fixed-hittest.html

@@ -77 +77 @@
         function buttonClicked()
         {
-            document.getElementById('result').textContent = 'PASS: hit testing found #target after select interation';
+            document.getElementById('result').textContent = 'PASS: hit testing found #target after select interaction';
             if (window.testRunner)
                 testRunner.notifyDone();

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-01-26  Megan Gardner  <megan_gardner@apple.com>
+
+        Don't retain focus for input peripheral views
+        https://bugs.webkit.org/show_bug.cgi?id=182204
+
+        Reviewed by Tim Horton.
+
+        Retaining focus on input peripheral views makes it so they cannot dismiss themselves with
+        the current architecture. This should probably be fixed in UIKit, as there is no reason for
+        focus to be retained on these views anyways, as they don't have keyboard input, but this
+        guards against over-aggressive retain requests.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _restoreFocusWithToken:]):
+        (-[WKContentView _preserveFocusWithToken:destructively:]):
+
 2018-01-26  Chris Dumez  <cdumez@apple.com>
 

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

@@ -4170 +4170 @@
 - (void)_restoreFocusWithToken:(id <NSCopying, NSSecureCoding>)token
 {
-    --_webView->_activeFocusedStateRetainCount;
+    if (!_inputPeripheral)
+        --_webView->_activeFocusedStateRetainCount;
 }
 
 - (void)_preserveFocusWithToken:(id <NSCopying, NSSecureCoding>)token destructively:(BOOL)destructively
 {
-    ++_webView->_activeFocusedStateRetainCount;
+    if (!_inputPeripheral)
+        ++_webView->_activeFocusedStateRetainCount;
 }