Changeset 227855 in webkit

Timestamp:

Jan 30, 2018, 2:16:08 PM (8 years ago)

Author:

Megan Gardner

Message:

Make preserve and restore focus more likely to be symmetrical
​https://bugs.webkit.org/show_bug.cgi?id=182264
Source/WebKit:

<rdar://problem/36948473>

Reviewed by Tim Horton.

Keep a stack of if we actually increment the focusState, so that
changes to the web content do not result in asymmetric decrements to the focus state.
To work around problems associated with <rdar://problem/37000122>.

• UIProcess/ios/WKContentViewInteraction.h:
• UIProcess/ios/WKContentViewInteraction.mm:

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

LayoutTests:

Reviewed by Tim Horton.

Added new test to verify that opening a selection form twice works.

• fast/forms/ios/ipad/select-form-run-twice-expected.txt: Added.
• fast/forms/ios/ipad/select-form-run-twice.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/ios/ipad/select-form-run-twice-expected.txt (added)
• LayoutTests/fast/forms/ios/ipad/select-form-run-twice.html (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-01-30  Megan Gardner  <megan_gardner@apple.com>
+
+        Make preserve and restore focus more likely to be symmetrical
+        https://bugs.webkit.org/show_bug.cgi?id=182264
+
+        Reviewed by Tim Horton.
+
+        Added new test to verify that opening a selection form twice works.
+
+        * fast/forms/ios/ipad/select-form-run-twice-expected.txt: Added.
+        * fast/forms/ios/ipad/select-form-run-twice.html: Added.
+
 2018-01-30  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-01-30  Megan Gardner  <megan_gardner@apple.com>
+
+        Make preserve and restore focus more likely to be symmetrical
+        https://bugs.webkit.org/show_bug.cgi?id=182264
+        <rdar://problem/36948473>
+        
+        Reviewed by Tim Horton.
+
+        Keep a stack of if we actually increment the focusState, so that
+        changes to the web content do not result in asymmetric decrements to the focus state. 
+        To work around problems associated with <rdar://problem/37000122>.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _restoreFocusWithToken:]):
+        (-[WKContentView _preserveFocusWithToken:destructively:]):
+
 2018-01-30  Brent Fulgham  <bfulgham@apple.com>
 

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

@@ -172 +172 @@
     RetainPtr<UIGestureRecognizer> _previewGestureRecognizer;
     RetainPtr<UIGestureRecognizer> _previewSecondaryGestureRecognizer;
+    Vector<bool> _focusStateStack;
 #if HAVE(LINK_PREVIEW)
     RetainPtr<UIPreviewItemController> _previewItemController;

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

@@ -4170 +4170 @@
 - (void)_restoreFocusWithToken:(id <NSCopying, NSSecureCoding>)token
 {
-    if (!_inputPeripheral)
+    ASSERT(!_focusStateStack.isEmpty());
+    
+    if (_focusStateStack.takeLast()) {
+        ASSERT(_webView->_activeFocusedStateRetainCount);
         --_webView->_activeFocusedStateRetainCount;
+    }
 }
 
 - (void)_preserveFocusWithToken:(id <NSCopying, NSSecureCoding>)token destructively:(BOOL)destructively
 {
-    if (!_inputPeripheral)
+    if (!_inputPeripheral) {
         ++_webView->_activeFocusedStateRetainCount;
+        _focusStateStack.append(true);
+    } else
+        _focusStateStack.append(false);
 }