Changeset 221922 in webkit

Timestamp:

Sep 12, 2017, 9:37:04 AM (7 years ago)

Author:

achristensen@apple.com

Message:

Add WKUIDelegatePrivate equivalent of WKPageUIClient's runModal
​https://bugs.webkit.org/show_bug.cgi?id=176728
<rdar://problem/29270035>
Source/WebKit:

Covered by a new API test.

Reviewed by Tim Horton.

• UIProcess/API/APIUIClient.h:

(API::UIClient::runModal):

• UIProcess/API/C/WKPage.cpp:

(WKPageSetPageUIClient):

• UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
• UIProcess/Cocoa/UIDelegate.h:
• UIProcess/Cocoa/UIDelegate.mm:

(WebKit::UIDelegate::setDelegate):
(WebKit::UIDelegate::UIClient::canRunModal const):
(WebKit::UIDelegate::UIClient::runModal):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::runModal):

Tools:

Reviewed by Tim Horton.

• TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:

(-[ModalDelegate _webViewRunModal:]):
(-[ModalDelegate webView:createWebViewWithConfiguration:forNavigationAction:windowFeatures:]):
(TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/APIUIClient.h (modified) (1 diff)
• Source/WebKit/UIProcess/API/C/WKPage.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (modified) (1 diff)
• Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/Cocoa/UIDelegate.h (modified) (2 diffs)
• Source/WebKit/UIProcess/Cocoa/UIDelegate.mm (modified) (2 diffs)
• Source/WebKit/UIProcess/WebPageProxy.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-09-12  Alex Christensen  <achristensen@webkit.org>
+
+        Add WKUIDelegatePrivate equivalent of WKPageUIClient's runModal
+        https://bugs.webkit.org/show_bug.cgi?id=176728
+        <rdar://problem/29270035>
+        
+        Covered by a new API test.
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/APIUIClient.h:
+        (API::UIClient::runModal):
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageSetPageUIClient):
+        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+        * UIProcess/Cocoa/UIDelegate.h:
+        * UIProcess/Cocoa/UIDelegate.mm:
+        (WebKit::UIDelegate::setDelegate):
+        (WebKit::UIDelegate::UIClient::canRunModal const):
+        (WebKit::UIDelegate::UIClient::runModal):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::runModal):
+
 2017-09-12  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/API/APIUIClient.h

@@ -138 +138 @@
 
     virtual bool canRunModal() const { return false; }
-    virtual void runModal(WebKit::WebPageProxy*) { }
+    virtual void runModal(WebKit::WebPageProxy&) { }
 
     virtual void saveDataToFileInDownloadsFolder(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, const WebCore::URL&, Data&) { }

trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp

@@ -2034 +2034 @@
         }
 
-        void runModal(WebPageProxy* page) final
+        void runModal(WebPageProxy& page) final
         {
             if (!m_client.runModal)
                 return;
 
-            m_client.runModal(toAPI(page), m_client.base.clientInfo);
+            m_client.runModal(toAPI(&page), m_client.base.clientInfo);
         }
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h

@@ -155 +155 @@
 - (void)_unfocusWebView:(WKWebView *)webView WK_API_AVAILABLE(macosx(WK_MAC_TBA));
 - (void)_webViewDidScroll:(WKWebView *)webView WK_API_AVAILABLE(macosx(WK_MAC_TBA));
+- (void)_webViewRunModal:(WKWebView *)webView WK_API_AVAILABLE(macosx(WK_MAC_TBA));
 - (void)_webView:(WKWebView *)webView takeFocus:(_WKFocusDirection)direction WK_API_AVAILABLE(macosx(WK_MAC_TBA));
 - (void)_webView:(WKWebView *)webView didNotHandleWheelEvent:(NSEvent *)event WK_API_AVAILABLE(macosx(WK_MAC_TBA));

trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp

@@ -211 +211 @@
     bool canRunModal() const final { return true; }
 
-    void runModal(WebPageProxy*) final
+    void runModal(WebPageProxy&) final
     {
         webkitWebViewRunAsModal(m_webView);

trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h

@@ -99 +99 @@
         void focus(WebPageProxy*) final;
         void unfocus(WebPageProxy*) final;
+        bool canRunModal() const final;
+        void runModal(WebPageProxy&) final;
         void pageDidScroll(WebPageProxy*) final;
         void didNotHandleWheelEvent(WebPageProxy*, const NativeWebWheelEvent&) final;
@@ -153 +155 @@
         bool focusWebView : 1;
         bool unfocusWebView : 1;
+        bool webViewRunModal : 1;
         bool webViewTakeFocus : 1;
         bool webViewDidScroll : 1;

trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm

@@ -111 +111 @@
     m_delegateMethods.unfocusWebView = [delegate respondsToSelector:@selector(_unfocusWebView:)];
     m_delegateMethods.webViewTakeFocus = [delegate respondsToSelector:@selector(_webView:takeFocus:)];
+    m_delegateMethods.webViewRunModal = [delegate respondsToSelector:@selector(_webViewRunModal:)];
     m_delegateMethods.webViewDidScroll = [delegate respondsToSelector:@selector(_webViewDidScroll:)];
     m_delegateMethods.webViewGetToolbarsAreVisibleWithCompletionHandler = [delegate respondsToSelector:@selector(_webView:getToolbarsAreVisibleWithCompletionHandler:)];
@@ -401 +402 @@
     
     [(id <WKUIDelegatePrivate>)delegate _webView:m_uiDelegate.m_webView takeFocus:toWKFocusDirection(direction)];
+}
+
+bool UIDelegate::UIClient::canRunModal() const
+{
+    return m_uiDelegate.m_delegateMethods.webViewRunModal;
+}
+
+void UIDelegate::UIClient::runModal(WebPageProxy&)
+{
+    if (!m_uiDelegate.m_delegateMethods.webViewRunModal)
+        return;
+    
+    auto delegate = m_uiDelegate.m_delegate.get();
+    if (!delegate)
+        return;
+
+    [(id <WKUIDelegatePrivate>)delegate _webViewRunModal:m_uiDelegate.m_webView];
 }
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -5960 +5960 @@
     m_process->connection()->wakeUpRunLoop();
 
-    m_uiClient->runModal(this);
+    m_uiClient->runModal(*this);
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2017-09-12  Alex Christensen  <achristensen@webkit.org>
+
+        Add WKUIDelegatePrivate equivalent of WKPageUIClient's runModal
+        https://bugs.webkit.org/show_bug.cgi?id=176728
+        <rdar://problem/29270035>
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:
+        (-[ModalDelegate _webViewRunModal:]):
+        (-[ModalDelegate webView:createWebViewWithConfiguration:forNavigationAction:windowFeatures:]):
+        (TEST):
+
 2017-09-12  Daniel Bates  <dabates@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm

@@ -149 +149 @@
 }
 
+@interface ModalDelegate : NSObject <WKUIDelegatePrivate>
+@end
+
+@implementation ModalDelegate
+
+- (void)_webViewRunModal:(WKWebView *)webView
+{
+    EXPECT_EQ(webView, createdWebView.get());
+    done = true;
+}
+
+- (nullable WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures
+{
+    createdWebView = [[[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration] autorelease];
+    [createdWebView setUIDelegate:self];
+    return createdWebView.get();
+}
+
+@end
+
+TEST(WebKit, RunModal)
+{
+    auto delegate = adoptNS([[ModalDelegate alloc] init]);
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600)]);
+    [webView setUIDelegate:delegate.get()];
+    NSURL *url = [[NSBundle mainBundle] URLForResource:@"simple" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"];
+    NSString *html = [NSString stringWithFormat:@"%@%@%@", @"<script> function openModal() { window.showModalDialog('", url, @"'); } </script> <input type='button' value='Click to open modal' onclick='openModal();'>"];
+    [webView synchronouslyLoadHTMLString:html];
+    [webView sendClicksAtPoint:NSMakePoint(20, 600 - 20) numberOfClicks:1];
+    TestWebKitAPI::Util::run(&done);
+}
 
 #if PLATFORM(MAC)