Changeset 163112 in webkit

Timestamp:

Jan 30, 2014 2:06:42 PM (10 years ago)

Author:

andersca@apple.com

Message:

Implement policy response delegate handling
​https://bugs.webkit.org/show_bug.cgi?id=127945

Reviewed by Dan Bernstein.

• UIProcess/API/APIPolicyClient.h:

(API::PolicyClient::decidePolicyForResponse):

• UIProcess/API/C/WKPage.cpp:

(WKPageSetPagePolicyClient):

• UIProcess/API/Cocoa/WKNavigationDelegate.h:

(NS_ENUM):

• UIProcess/Cocoa/NavigationState.h:
• UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::setNavigationDelegate):
(WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
(WebKit::NavigationState::PolicyClient::decidePolicyForResponse):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::decidePolicyForResponse):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APIPolicyClient.h (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (2 diffs)
• UIProcess/API/Cocoa/WKNavigationDelegate.h (modified) (3 diffs)
• UIProcess/Cocoa/NavigationState.h (modified) (2 diffs)
• UIProcess/Cocoa/NavigationState.mm (modified) (3 diffs)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-30  Anders Carlsson  <andersca@apple.com>
+
+        Implement policy response delegate handling
+        https://bugs.webkit.org/show_bug.cgi?id=127945
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/API/APIPolicyClient.h:
+        (API::PolicyClient::decidePolicyForResponse):
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageSetPagePolicyClient):
+        * UIProcess/API/Cocoa/WKNavigationDelegate.h:
+        (NS_ENUM):
+        * UIProcess/Cocoa/NavigationState.h:
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::setNavigationDelegate):
+        (WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
+        (WebKit::NavigationState::PolicyClient::decidePolicyForResponse):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::decidePolicyForResponse):
+
 2014-01-29  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/APIPolicyClient.h

@@ -54 +54 @@
     virtual void decidePolicyForNavigationAction(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebKit::NavigationActionData&, WebKit::WebFrameProxy* originatingFrame, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, RefPtr<WebKit::WebFramePolicyListenerProxy> listener, API::Object* userData) { listener->use(); }
     virtual void decidePolicyForNewWindowAction(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebCore::NavigationType, WebKit::WebEvent::Modifiers, WebKit::WebMouseEvent::Button, const WebCore::ResourceRequest&, const WTF::String& frameName, WebKit::WebFramePolicyListenerProxy* listener, API::Object* userData) { listener->use(); }
-    virtual void decidePolicyForResponse(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, WebKit::WebFramePolicyListenerProxy* listener, API::Object* userData) { listener->use(); }
+    virtual void decidePolicyForResponse(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, RefPtr<WebKit::WebFramePolicyListenerProxy> listener, API::Object* userData) { listener->use(); }
     virtual void unableToImplementPolicy(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object* userData) { }
 };

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

@@ -1024 +1024 @@
         }
 
-        virtual void decidePolicyForResponse(WebPageProxy* page, WebFrameProxy* frame, const ResourceResponse& resourceResponse, const ResourceRequest& resourceRequest, bool canShowMIMEType, WebFramePolicyListenerProxy* listener, API::Object* userData) override
+        virtual void decidePolicyForResponse(WebPageProxy* page, WebFrameProxy* frame, const ResourceResponse& resourceResponse, const ResourceRequest& resourceRequest, bool canShowMIMEType, RefPtr<WebFramePolicyListenerProxy> listener, API::Object* userData) override
         {
             if (!m_client.decidePolicyForResponse_deprecatedForUseWithV0 && !m_client.decidePolicyForResponse) {
@@ -1035 +1035 @@
 
             if (m_client.decidePolicyForResponse_deprecatedForUseWithV0)
-                m_client.decidePolicyForResponse_deprecatedForUseWithV0(toAPI(page), toAPI(frame), toAPI(response.get()), toAPI(request.get()), toAPI(listener), toAPI(userData), m_client.base.clientInfo);
+                m_client.decidePolicyForResponse_deprecatedForUseWithV0(toAPI(page), toAPI(frame), toAPI(response.get()), toAPI(request.get()), toAPI(listener.get()), toAPI(userData), m_client.base.clientInfo);
             else
-                m_client.decidePolicyForResponse(toAPI(page), toAPI(frame), toAPI(response.get()), toAPI(request.get()), canShowMIMEType, toAPI(listener), toAPI(userData), m_client.base.clientInfo);
+                m_client.decidePolicyForResponse(toAPI(page), toAPI(frame), toAPI(response.get()), toAPI(request.get()), canShowMIMEType, toAPI(listener.get()), toAPI(userData), m_client.base.clientInfo);
         }
 

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

@@ -30 +30 @@
 
 @class WKNavigationAction;
+@class WKNavigationResponse;
 @class WKWebView;
 
@@ -38 +39 @@
 };
 
+typedef NS_ENUM(NSInteger, WKNavigationResponsePolicyDecision) {
+    WKNavigationResponsePolicyDecisionCancel,
+    WKNavigationResponsePolicyDecisionAllow,
+    WKNavigationResponsePolicyDecisionBecomeDownload
+};
+
 @protocol WKNavigationDelegate <NSObject>
 
@@ -43 +50 @@
 
 - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationPolicyDecision))decisionHandler;
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicyDecision))decisionHandler;
 
 @end

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

@@ -63 +63 @@
         // API::PolicyClient
         virtual void decidePolicyForNavigationAction(WebPageProxy*, WebFrameProxy*, const NavigationActionData&, WebFrameProxy* originatingFrame, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, RefPtr<WebFramePolicyListenerProxy>, API::Object* userData) override;
+        virtual void decidePolicyForResponse(WebPageProxy*, WebFrameProxy*, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, RefPtr<WebFramePolicyListenerProxy>, API::Object* userData) override;
 
         NavigationState& m_navigationState;
@@ -69 +70 @@
     struct {
         bool webViewDecidePolicyForNavigationActionDecisionHandler : 1;
+        bool webViewDecidePolicyForNavigationResponseDecisionHandler : 1;
     } m_navigationDelegateMethods;
 

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

@@ -53 +53 @@
 
     m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandler = [delegate respondsToSelector:@selector(webView:decidePolicyForNavigationAction:decisionHandler:)];
+    m_navigationDelegateMethods.webViewDecidePolicyForNavigationResponseDecisionHandler = [delegate respondsToSelector:@selector(webView:decidePolicyForNavigationResponse:decisionHandler:)];
 }
 
@@ -97 +98 @@
     WKNavigationAction *navigationAction = nil;
 
-    [navigationDelegate.get() webView:m_navigationState.m_webView decidePolicyForNavigationAction:navigationAction decisionHandler:[listener](WKNavigationPolicyDecision policyDecision) {
+    [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationAction:navigationAction decisionHandler:[listener](WKNavigationPolicyDecision policyDecision) {
         switch (policyDecision) {
         case WKNavigationPolicyDecisionAllow:
@@ -114 +115 @@
 }
 
+void NavigationState::PolicyClient::decidePolicyForResponse(WebPageProxy*, WebFrameProxy*, const WebCore::ResourceResponse&, const WebCore::ResourceRequest& resourceRequest, bool canShowMIMEType, RefPtr<WebFramePolicyListenerProxy> listener, API::Object* userData)
+{
+    if (!m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationResponseDecisionHandler) {
+        // FIXME: <rdar://problem/15949822> Figure out what the "default delegate behavior" should be here.
+        listener->use();
+        return;
+    }
+
+    auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
+    if (!navigationDelegate)
+        return;
+
+    // FIXME: Set up the navigation response object.
+    WKNavigationResponse *navigationResponse = nil;
+
+    [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationResponse:navigationResponse decisionHandler:[listener](WKNavigationResponsePolicyDecision policyDecision) {
+        switch (policyDecision) {
+        case WKNavigationResponsePolicyDecisionAllow:
+            listener->use();
+            break;
+
+        case WKNavigationResponsePolicyDecisionCancel:
+            listener->ignore();
+            break;
+
+        case WKNavigationResponsePolicyDecisionBecomeDownload:
+            listener->download();
+            break;
+        }
+    }];
+}
+
 } // namespace WebKit
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -2495 +2495 @@
     RefPtr<WebFramePolicyListenerProxy> listener = frame->setUpPolicyListenerProxy(listenerID);
 
-    m_policyClient->decidePolicyForResponse(this, frame, response, request, canShowMIMEType, listener.get(), userData.get());
+    m_policyClient->decidePolicyForResponse(this, frame, response, request, canShowMIMEType, std::move(listener), userData.get());
 }