Changeset 181511 in webkit

Timestamp:

Mar 15, 2015, 12:30:09 PM (10 years ago)

Author:

mitz@apple.com

Message:

[iOS] Presenting a modal sheet on top of a WKWebView causes it to lose focused, active state
​https://bugs.webkit.org/show_bug.cgi?id=142702

Reviewed by Anders Carlsson.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView becomeFirstResponder]): Override to delegate first responder status to the
WKContentView if possible.
(-[WKWebView _retainActiveFocusedState]): New SPI that prevents view hierarchy changes from
affecting the active and focused state of the view. Increments a counter ivar and returns a
completion block (which callers must call when they’re done) that decrements it back.

• UIProcess/API/Cocoa/WKWebViewInternal.h: Declared new _activeFocusedStateRetainCount ivar

with @package access.

• UIProcess/API/Cocoa/WKWebViewPrivate.h: Declared new method.

• UIProcess/ios/PageClientImplIOS.mm:

(WebKit::PageClientImpl::isViewWindowActive): Return true if active/focused state is to be
maintained despite not being visible.
(WebKit::PageClientImpl::isViewFocused): Return true if active/focused state is to be
maintained despite not being active.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView resignFirstResponder]): Don’t blur the assisted node if active/focused
state is to be maintained.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/WKWebViewInternal.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewPrivate.h (modified) (1 diff)
• UIProcess/ios/PageClientImplIOS.mm (modified) (2 diffs)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-15  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Presenting a modal sheet on top of a WKWebView causes it to lose focused, active state
+        https://bugs.webkit.org/show_bug.cgi?id=142702
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView becomeFirstResponder]): Override to delegate first responder status to the
+        WKContentView if possible.
+        (-[WKWebView _retainActiveFocusedState]): New SPI that prevents view hierarchy changes from
+        affecting the active and focused state of the view. Increments a counter ivar and returns a
+        completion block (which callers must call when they’re done) that decrements it back.
+        * UIProcess/API/Cocoa/WKWebViewInternal.h: Declared new _activeFocusedStateRetainCount ivar
+        with @package access.
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h: Declared new method.
+
+        * UIProcess/ios/PageClientImplIOS.mm:
+        (WebKit::PageClientImpl::isViewWindowActive): Return true if active/focused state is to be
+        maintained despite not being visible.
+        (WebKit::PageClientImpl::isViewFocused): Return true if active/focused state is to be
+        maintained despite not being active.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView resignFirstResponder]): Don’t blur the assisted node if active/focused
+        state is to be maintained.
+
 2015-03-14  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -651 +651 @@
 }
 
+- (BOOL)becomeFirstResponder
+{
+    return [_contentView becomeFirstResponder] || [super becomeFirstResponder];
+}
+
 static inline CGFloat floorToDevicePixel(CGFloat input, float deviceScaleFactor)
 {
@@ -1771 +1776 @@
     return webView->_overridesInterfaceOrientation ? deviceOrientationForUIInterfaceOrientation(webView->_interfaceOrientationOverride) : webView->_page->deviceOrientation();
 }
+
+- (void (^)(void))_retainActiveFocusedState
+{
+    ++_activeFocusedStateRetainCount;
+
+    // FIXME: Use something like CompletionHandlerCallChecker to ensure that the returned block is called before it's released.
+    return [[[self] {
+        --_activeFocusedStateRetainCount;
+    } copy] autorelease];
+}
+
 #endif
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h

@@ -61 +61 @@
 
     RefPtr<WebKit::WebPageProxy> _page;
+
+#if PLATFORM(IOS)
+    NSUInteger _activeFocusedStateRetainCount;
+#endif
 }
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

@@ -152 +152 @@
 - (void)_didRelaunchProcess;
 
+// Puts the view into a state where being taken out of the view hierarchy and resigning first responder
+// will not count as becoming inactive and unfocused. The returned block must be called to exit the state.
+- (void (^)(void))_retainActiveFocusedState WK_AVAILABLE(NA, WK_IOS_TBA);
+
 #else
 @property (readonly) NSColor *_pageExtendedBackgroundColor;

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

@@ -172 +172 @@
 {
     // FIXME: https://bugs.webkit.org/show_bug.cgi?id=133098
-    return isViewVisible();
+    return isViewVisible() || m_webView->_activeFocusedStateRetainCount;
 }
 
@@ -178 +178 @@
 {
     // FIXME: https://bugs.webkit.org/show_bug.cgi?id=133098
-    return isViewWindowActive();
+    return isViewWindowActive() || m_webView->_activeFocusedStateRetainCount;
 }
 

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

@@ -518 +518 @@
     // FIXME: Maybe we should call resignFirstResponder on the superclass
     // and do nothing if the return value is NO.
-    // We need to complete the editing operation before we blur the element.
-    [_inputPeripheral endEditing];
-    _page->blurAssistedNode();
+
+    if (!_webView->_activeFocusedStateRetainCount) {
+        // We need to complete the editing operation before we blur the element.
+        [_inputPeripheral endEditing];
+        _page->blurAssistedNode();
+    }
+
     [self _cancelInteraction];
     [_webSelectionAssistant resignedFirstResponder];