<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163108] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163108">163108</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-30 13:28:13 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Begin fleshing out the navigation delegate
https://bugs.webkit.org/show_bug.cgi?id=127939
Reviewed by Dan Bernstein.
* UIProcess/API/APIPolicyClient.h:
(API::PolicyClient::decidePolicyForNavigationAction):
Pass the listener as a RefPtr.
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPagePolicyClient):
Update for API::PolicyClient changes.
* UIProcess/API/Cocoa/WKNavigationDelegate.h:
Add new delegate.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
Set a policy client on the page.
* UIProcess/Cocoa/NavigationState.h:
Add a new PolicyClient class.
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::NavigationState):
Initialize m_navigationDelegateMethods.
(WebKit::NavigationState::navigationDelegate):
m_delegate was renamed to m_navigationDelegate.
(WebKit::NavigationState::setNavigationDelegate):
Update m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandler.
(WebKit::NavigationState::createPolicyClient):
New helper function for creating a new policy client.
(WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
Call the navigation delegate method.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::decidePolicyForNavigationAction):
Use std::move to hand off the listener to the client.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIPolicyClienth">trunk/Source/WebKit2/UIProcess/API/APIPolicyClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationDelegateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStateh">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStatemm">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163107 => 163108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-30 21:26:21 UTC (rev 163107)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-30 21:28:13 UTC (rev 163108)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2014-01-30 Anders Carlsson <andersca@apple.com>
+
+ Begin fleshing out the navigation delegate
+ https://bugs.webkit.org/show_bug.cgi?id=127939
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/APIPolicyClient.h:
+ (API::PolicyClient::decidePolicyForNavigationAction):
+ Pass the listener as a RefPtr.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPagePolicyClient):
+ Update for API::PolicyClient changes.
+
+ * UIProcess/API/Cocoa/WKNavigationDelegate.h:
+ Add new delegate.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ Set a policy client on the page.
+
+ * UIProcess/Cocoa/NavigationState.h:
+ Add a new PolicyClient class.
+
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::NavigationState):
+ Initialize m_navigationDelegateMethods.
+
+ (WebKit::NavigationState::navigationDelegate):
+ m_delegate was renamed to m_navigationDelegate.
+
+ (WebKit::NavigationState::setNavigationDelegate):
+ Update m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandler.
+
+ (WebKit::NavigationState::createPolicyClient):
+ New helper function for creating a new policy client.
+
+ (WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
+ Call the navigation delegate method.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::decidePolicyForNavigationAction):
+ Use std::move to hand off the listener to the client.
+
</ins><span class="cx"> 2014-01-30 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in RemoteLayerBackingStore::encode when m_frontBuffer is nullptr.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIPolicyClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIPolicyClient.h (163107 => 163108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIPolicyClient.h 2014-01-30 21:26:21 UTC (rev 163107)
+++ trunk/Source/WebKit2/UIProcess/API/APIPolicyClient.h 2014-01-30 21:28:13 UTC (rev 163108)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~PolicyClient() { }
</span><span class="cx">
</span><del>- virtual void decidePolicyForNavigationAction(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebKit::NavigationActionData&, WebKit::WebFrameProxy* originatingFrame, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, WebKit::WebFramePolicyListenerProxy* listener, API::Object* userData) { listener->use(); }
</del><ins>+ 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(); }
</ins><span class="cx"> 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(); }
</span><span class="cx"> virtual void decidePolicyForResponse(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, WebKit::WebFramePolicyListenerProxy* listener, API::Object* userData) { listener->use(); }
</span><span class="cx"> virtual void unableToImplementPolicy(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object* userData) { }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (163107 => 163108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-01-30 21:26:21 UTC (rev 163107)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-01-30 21:28:13 UTC (rev 163108)
</span><span class="lines">@@ -993,7 +993,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void decidePolicyForNavigationAction(WebPageProxy* page, WebFrameProxy* frame, const NavigationActionData& navigationActionData, WebFrameProxy* originatingFrame, const WebCore::ResourceRequest& originalResourceRequest, const WebCore::ResourceRequest& resourceRequest, WebFramePolicyListenerProxy* listener, API::Object* userData) override
</del><ins>+ virtual void decidePolicyForNavigationAction(WebPageProxy* page, WebFrameProxy* frame, const NavigationActionData& navigationActionData, WebFrameProxy* originatingFrame, const WebCore::ResourceRequest& originalResourceRequest, const WebCore::ResourceRequest& resourceRequest, RefPtr<WebFramePolicyListenerProxy> listener, API::Object* userData) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.decidePolicyForNavigationAction_deprecatedForUseWithV0 && !m_client.decidePolicyForNavigationAction_deprecatedForUseWithV1 && !m_client.decidePolicyForNavigationAction) {
</span><span class="cx"> listener->use();
</span><span class="lines">@@ -1004,11 +1004,11 @@
</span><span class="cx"> RefPtr<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</span><span class="cx">
</span><span class="cx"> if (m_client.decidePolicyForNavigationAction_deprecatedForUseWithV0)
</span><del>- m_client.decidePolicyForNavigationAction_deprecatedForUseWithV0(toAPI(page), toAPI(frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(request.get()), toAPI(listener), toAPI(userData), m_client.base.clientInfo);
</del><ins>+ m_client.decidePolicyForNavigationAction_deprecatedForUseWithV0(toAPI(page), toAPI(frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(request.get()), toAPI(listener.get()), toAPI(userData), m_client.base.clientInfo);
</ins><span class="cx"> else if (m_client.decidePolicyForNavigationAction_deprecatedForUseWithV1)
</span><del>- m_client.decidePolicyForNavigationAction_deprecatedForUseWithV1(toAPI(page), toAPI(frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(originatingFrame), toAPI(request.get()), toAPI(listener), toAPI(userData), m_client.base.clientInfo);
</del><ins>+ m_client.decidePolicyForNavigationAction_deprecatedForUseWithV1(toAPI(page), toAPI(frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(originatingFrame), toAPI(request.get()), toAPI(listener.get()), toAPI(userData), m_client.base.clientInfo);
</ins><span class="cx"> else
</span><del>- m_client.decidePolicyForNavigationAction(toAPI(page), toAPI(frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(originatingFrame), toAPI(originalRequest.get()), toAPI(request.get()), toAPI(listener), toAPI(userData), m_client.base.clientInfo);
</del><ins>+ m_client.decidePolicyForNavigationAction(toAPI(page), toAPI(frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(originatingFrame), toAPI(originalRequest.get()), toAPI(request.get()), toAPI(listener.get()), toAPI(userData), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void decidePolicyForNewWindowAction(WebPageProxy* page, WebFrameProxy* frame, NavigationType type, WebEvent::Modifiers modifiers, WebMouseEvent::Button mouseButton, const ResourceRequest& resourceRequest, const String& frameName, WebFramePolicyListenerProxy* listener, API::Object* userData) override
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h (163107 => 163108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2014-01-30 21:26:21 UTC (rev 163107)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2014-01-30 21:28:13 UTC (rev 163108)
</span><span class="lines">@@ -28,8 +28,21 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+@class WKNavigationAction;
+@class WKWebView;
+
+typedef NS_ENUM(NSInteger, WKNavigationPolicyDecision) {
+ WKNavigationPolicyDecisionCancel,
+ WKNavigationPolicyDecisionAllow,
+ WKNavigationPolicyDecisionDownload
+};
+
</ins><span class="cx"> @protocol WKNavigationDelegate <NSObject>
</span><span class="cx">
</span><ins>+@optional
+
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationPolicyDecision))decisionHandler;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (163107 => 163108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-01-30 21:26:21 UTC (rev 163107)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-01-30 21:28:13 UTC (rev 163108)
</span><span class="lines">@@ -119,6 +119,8 @@
</span><span class="cx"> _page = WebKit::toImpl([_wkView pageRef]);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ _page->setPolicyClient(_navigationState->createPolicyClient());
+
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (163107 => 163108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-01-30 21:26:21 UTC (rev 163107)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-01-30 21:28:13 UTC (rev 163108)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #import <wtf/HashMap.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import "APIPolicyClient.h"
</ins><span class="cx"> #import "WeakObjCPtr.h"
</span><span class="cx">
</span><span class="cx"> @class WKNavigation;
</span><span class="lines">@@ -45,15 +46,34 @@
</span><span class="cx"> explicit NavigationState(WKWebView *);
</span><span class="cx"> ~NavigationState();
</span><span class="cx">
</span><ins>+ std::unique_ptr<API::PolicyClient> createPolicyClient();
+
</ins><span class="cx"> RetainPtr<id <WKNavigationDelegate> > navigationDelegate();
</span><span class="cx"> void setNavigationDelegate(id <WKNavigationDelegate>);
</span><span class="cx">
</span><span class="cx"> RetainPtr<WKNavigation> createLoadRequestNavigation(uint64_t navigationID, NSURLRequest *);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ class PolicyClient : public API::PolicyClient {
+ public:
+ explicit PolicyClient(NavigationState&);
+ ~PolicyClient();
+
+ private:
+ // API::PolicyClient
+ virtual void decidePolicyForNavigationAction(WebPageProxy*, WebFrameProxy*, const NavigationActionData&, WebFrameProxy* originatingFrame, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, RefPtr<WebFramePolicyListenerProxy>, API::Object* userData) override;
+
+ NavigationState& m_navigationState;
+ };
+
+ struct {
+ bool webViewDecidePolicyForNavigationActionDecisionHandler : 1;
+ } m_navigationDelegateMethods;
+
+ WKWebView *m_webView;
+ WeakObjCPtr<id <WKNavigationDelegate> > m_navigationDelegate;
+
</ins><span class="cx"> HashMap<uint64_t, RetainPtr<WKNavigation>> m_navigations;
</span><del>-
- WeakObjCPtr<id <WKNavigationDelegate> > m_delegate;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (163107 => 163108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-01-30 21:26:21 UTC (rev 163107)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-01-30 21:28:13 UTC (rev 163108)
</span><span class="lines">@@ -28,11 +28,13 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "WKNavigationDelegate.h"
</ins><span class="cx"> #import "WKNavigationInternal.h"
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> NavigationState::NavigationState(WKWebView *webView)
</span><ins>+ : m_navigationDelegateMethods()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -42,12 +44,14 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<id <WKNavigationDelegate> > NavigationState::navigationDelegate()
</span><span class="cx"> {
</span><del>- return m_delegate.get();
</del><ins>+ return m_navigationDelegate.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NavigationState::setNavigationDelegate(id <WKNavigationDelegate> delegate)
</span><span class="cx"> {
</span><del>- m_delegate = delegate;
</del><ins>+ m_navigationDelegate = delegate;
+
+ m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandler = [delegate respondsToSelector:@selector(webView:decidePolicyForNavigationAction:decisionHandler:)];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RetainPtr<WKNavigation> NavigationState::createLoadRequestNavigation(uint64_t navigationID, NSURLRequest *request)
</span><span class="lines">@@ -63,6 +67,52 @@
</span><span class="cx"> return navigation;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+std::unique_ptr<API::PolicyClient> NavigationState::createPolicyClient()
+{
+ return std::make_unique<PolicyClient>(*this);
+}
+
+NavigationState::PolicyClient::PolicyClient(NavigationState& navigationState)
+ : m_navigationState(navigationState)
+{
+}
+
+NavigationState::PolicyClient::~PolicyClient()
+{
+}
+
+void NavigationState::PolicyClient::decidePolicyForNavigationAction(WebPageProxy*, WebFrameProxy*, const NavigationActionData&, WebFrameProxy* originatingFrame, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, RefPtr<WebFramePolicyListenerProxy> listener, API::Object* userData)
+{
+ if (!m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandler) {
+ // 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 action object.
+ WKNavigationAction *navigationAction = nil;
+
+ [navigationDelegate.get() webView:m_navigationState.m_webView decidePolicyForNavigationAction:navigationAction decisionHandler:[listener](WKNavigationPolicyDecision policyDecision) {
+ switch (policyDecision) {
+ case WKNavigationPolicyDecisionAllow:
+ listener->use();
+ break;
+
+ case WKNavigationPolicyDecisionCancel:
+ listener->ignore();
+ break;
+
+ case WKNavigationPolicyDecisionDownload:
+ listener->download();
+ break;
+ }
+ }];
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (163107 => 163108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-30 21:26:21 UTC (rev 163107)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-30 21:28:13 UTC (rev 163108)
</span><span class="lines">@@ -2452,7 +2452,7 @@
</span><span class="cx"> m_inDecidePolicyForNavigationAction = true;
</span><span class="cx"> m_syncNavigationActionPolicyActionIsValid = false;
</span><span class="cx">
</span><del>- m_policyClient->decidePolicyForNavigationAction(this, frame, navigationActionData, originatingFrame, originalRequest, request, listener.get(), userData.get());
</del><ins>+ m_policyClient->decidePolicyForNavigationAction(this, frame, navigationActionData, originatingFrame, originalRequest, request, std::move(listener), userData.get());
</ins><span class="cx">
</span><span class="cx"> m_inDecidePolicyForNavigationAction = false;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>