Changeset 166270 in webkit

Timestamp:

Mar 25, 2014 5:01:09 PM (10 years ago)

Author:

andersca@apple.com

Message:

Add a UI delegate callback for handling window.open
​https://bugs.webkit.org/show_bug.cgi?id=130757

Reviewed by Sam Weinig.

• UIProcess/API/Cocoa/WKUIDelegate.h:
• UIProcess/API/Cocoa/WKWebView.mm:
• UIProcess/API/Cocoa/WKWebViewInternal.h:
• UIProcess/Cocoa/UIClient.h:
• UIProcess/Cocoa/UIClient.mm:

(WebKit::UIClient::setDelegate):
(WebKit::UIClient::createNewPage):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKUIDelegate.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewInternal.h (modified) (2 diffs)
• UIProcess/Cocoa/UIClient.h (modified) (2 diffs)
• UIProcess/Cocoa/UIClient.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-25  Anders Carlsson  <andersca@apple.com>
+
+        Add a UI delegate callback for handling window.open
+        https://bugs.webkit.org/show_bug.cgi?id=130757
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/API/Cocoa/WKUIDelegate.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        * UIProcess/API/Cocoa/WKWebViewInternal.h:
+        * UIProcess/Cocoa/UIClient.h:
+        * UIProcess/Cocoa/UIClient.mm:
+        (WebKit::UIClient::setDelegate):
+        (WebKit::UIClient::createNewPage):
+
 2014-03-25  Anders Carlsson  <andersca@apple.com>
 

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

@@ -30 +30 @@
 
 @class WKFrameInfo;
+@class WKWebViewConfiguration;
+@class WKWindowFeatures;
 
 @protocol WKUIDelegate <NSObject>
 
 @optional
+
+// FIXME: Maybe we should pass a WKNavigationAction instead of request and frame.
+// The C SPI has the key modifiers and mouse button as well.
+- (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration request:(NSURLRequest *)request windowFeatures:(WKWindowFeatures *)windowFeatures initiatedByFrame:(WKFrameInfo *)frame;
 
 - (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)())completionHandler;

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

@@ -78 +78 @@
 
 @implementation WKWebView {
-    RetainPtr<WKWebViewConfiguration> _configuration;
     std::unique_ptr<WebKit::NavigationState> _navigationState;
 

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

@@ -29 +29 @@
 
 #import <wtf/RefPtr.h>
+#import <wtf/RetainPtr.h>
 
 #if PLATFORM(IOS)
@@ -51 +52 @@
 
 @package
+    RetainPtr<WKWebViewConfiguration> _configuration;
+
     RefPtr<WebKit::WebPageProxy> _page;
 }

trunk/Source/WebKit2/UIProcess/Cocoa/UIClient.h

@@ -53 +53 @@
 private:
     // API::UIClient
+    virtual PassRefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, WebKit::WebEvent::Modifiers, WebKit::WebMouseEvent::Button) override;
     virtual void runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void ()> completionHandler) override;
     virtual void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (bool)> completionHandler) override;
@@ -61 +62 @@
 
     struct {
+        bool webViewCreateWebViewWithConfigurationRequestWindowFeaturesInitiatedByFrame : 1;
         bool webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler : 1;
         bool webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;

trunk/Source/WebKit2/UIProcess/Cocoa/UIClient.mm

@@ -30 +30 @@
 
 #import "WKFrameInfoInternal.h"
+#import "WKWebViewConfigurationInternal.h"
+#import "WKWebViewInternal.h"
+#import "WKWindowFeaturesInternal.h"
 #import "WKUIDelegatePrivate.h"
 
@@ -52 +55 @@
     m_delegate = delegate;
 
+    m_delegateMethods.webViewCreateWebViewWithConfigurationRequestWindowFeaturesInitiatedByFrame = [delegate respondsToSelector:@selector(webView:createWebViewWithConfiguration:request:windowFeatures:initiatedByFrame:)];
     m_delegateMethods.webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:)];
     m_delegateMethods.webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:completionHandler:)];
@@ -73 +77 @@
 #endif
     return defaultActions;
+}
+
+PassRefPtr<WebKit::WebPageProxy> UIClient::createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy* initiatingFrame, const WebCore::ResourceRequest& request, const WebCore::WindowFeatures& windowFeatures, WebKit::WebEvent::Modifiers, WebKit::WebMouseEvent::Button)
+{
+    if (!m_delegateMethods.webViewCreateWebViewWithConfigurationRequestWindowFeaturesInitiatedByFrame)
+        return nullptr;
+
+    auto delegate = m_delegate.get();
+    if (!delegate)
+        return nullptr;
+
+    auto configuration = adoptNS([m_webView->_configuration copy]);
+    [configuration _setRelatedWebView:m_webView];
+
+    WKWebView *webView = [delegate webView:m_webView createWebViewWithConfiguration:configuration.get() request:request.nsURLRequest(WebCore::DoNotUpdateHTTPBody) windowFeatures:adoptNS([[WKWindowFeatures alloc] _initWithWindowFeatures:windowFeatures]).get() initiatedByFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*initiatingFrame]).get()];
+
+    if (!webView)
+        return nullptr;
+
+    if ([webView->_configuration _relatedWebView] != m_webView)
+        [NSException raise:NSInternalInconsistencyException format:@"Returned WKWebView was not created with the given configuration."];
+
+    return webView->_page.get();
 }