<!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>[169998] 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/169998">169998</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-06-15 20:23:55 -0700 (Sun, 15 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/17291697> [Cocoa] Can’t tell at policy decision time whether WebKit can handle the request
https://bugs.webkit.org/show_bug.cgi?id=133930
Reviewed by Sam Weinig.
* Shared/NavigationActionData.cpp:
(WebKit::NavigationActionData::NavigationActionData): Initialize new member canHandleRequest
to false.
(WebKit::NavigationActionData::encode): Encode canHandleRequest.
(WebKit::NavigationActionData::decode): Decode it.
* Shared/NavigationActionData.h: Declared new boolean member canHandleRequest.
* UIProcess/API/Cocoa/WKNavigationAction.mm:
(-[WKNavigationAction _initWithNavigationActionData:]): Set new ivar _canHandleRequest from
the action data.
(-[WKNavigationAction _canHandleRequest]): Added this getter.
* UIProcess/API/Cocoa/WKNavigationActionPrivate.h: Declared new property _canHandleRequest.
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::createWindow): Set canHandleRequest in the NavigationActionData.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction): Ditto.
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedNavigationActionDatacpp">trunk/Source/WebKit2/Shared/NavigationActionData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNavigationActionDatah">trunk/Source/WebKit2/Shared/NavigationActionData.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169997 => 169998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-16 01:45:36 UTC (rev 169997)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-16 03:23:55 UTC (rev 169998)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-06-15 Dan Bernstein <mitz@apple.com>
+
+ <rdar://problem/17291697> [Cocoa] Can’t tell at policy decision time whether WebKit can handle the request
+ https://bugs.webkit.org/show_bug.cgi?id=133930
+
+ Reviewed by Sam Weinig.
+
+ * Shared/NavigationActionData.cpp:
+ (WebKit::NavigationActionData::NavigationActionData): Initialize new member canHandleRequest
+ to false.
+ (WebKit::NavigationActionData::encode): Encode canHandleRequest.
+ (WebKit::NavigationActionData::decode): Decode it.
+ * Shared/NavigationActionData.h: Declared new boolean member canHandleRequest.
+
+ * UIProcess/API/Cocoa/WKNavigationAction.mm:
+ (-[WKNavigationAction _initWithNavigationActionData:]): Set new ivar _canHandleRequest from
+ the action data.
+ (-[WKNavigationAction _canHandleRequest]): Added this getter.
+ * UIProcess/API/Cocoa/WKNavigationActionPrivate.h: Declared new property _canHandleRequest.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::createWindow): Set canHandleRequest in the NavigationActionData.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction): Ditto.
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Ditto.
+
</ins><span class="cx"> 2014-06-15 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK2] Change ewk_view_settings_get to ewk_page_group_settings_get
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNavigationActionDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NavigationActionData.cpp (169997 => 169998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NavigationActionData.cpp 2014-06-16 01:45:36 UTC (rev 169997)
+++ trunk/Source/WebKit2/Shared/NavigationActionData.cpp 2014-06-16 03:23:55 UTC (rev 169998)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> , modifiers()
</span><span class="cx"> , mouseButton(WebMouseEvent::NoButton)
</span><span class="cx"> , isProcessingUserGesture(false)
</span><ins>+ , canHandleRequest(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -47,6 +48,7 @@
</span><span class="cx"> encoder.encodeEnum(modifiers);
</span><span class="cx"> encoder.encodeEnum(mouseButton);
</span><span class="cx"> encoder << isProcessingUserGesture;
</span><ins>+ encoder << canHandleRequest;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool NavigationActionData::decode(IPC::ArgumentDecoder& decoder, NavigationActionData& result)
</span><span class="lines">@@ -59,6 +61,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.isProcessingUserGesture))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(result.canHandleRequest))
+ return false;
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNavigationActionDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NavigationActionData.h (169997 => 169998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NavigationActionData.h 2014-06-16 01:45:36 UTC (rev 169997)
+++ trunk/Source/WebKit2/Shared/NavigationActionData.h 2014-06-16 03:23:55 UTC (rev 169998)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> WebEvent::Modifiers modifiers;
</span><span class="cx"> WebMouseEvent::Button mouseButton;
</span><span class="cx"> bool isProcessingUserGesture;
</span><ins>+ bool canHandleRequest;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm (169997 => 169998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2014-06-16 01:45:36 UTC (rev 169997)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2014-06-16 03:23:55 UTC (rev 169998)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> RetainPtr<NSURLRequest> _request;
</span><span class="cx"> RetainPtr<NSURL> _originalURL;
</span><span class="cx"> BOOL _userInitiated;
</span><ins>+ BOOL _canHandleRequest;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static WKNavigationType toWKNavigationType(WebCore::NavigationType navigationType)
</span><span class="lines">@@ -115,6 +116,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> _userInitiated = navigationActionData.isProcessingUserGesture;
</span><ins>+ _canHandleRequest = navigationActionData.canHandleRequest;
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -165,11 +167,20 @@
</span><span class="cx"> return _originalURL.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@end
+
+@implementation WKNavigationAction (WKPrivate)
+
</ins><span class="cx"> - (BOOL)_isUserInitiated
</span><span class="cx"> {
</span><span class="cx"> return _userInitiated;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_canHandleRequest
+{
+ return _canHandleRequest;
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h (169997 => 169998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h 2014-06-16 01:45:36 UTC (rev 169997)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h 2014-06-16 03:23:55 UTC (rev 169998)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) NSURL *_originalURL;
</span><span class="cx"> @property (nonatomic, readonly, getter=_isUserInitiated) BOOL _userInitiated;
</span><ins>+@property (nonatomic, readonly) BOOL _canHandleRequest;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (169997 => 169998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-06-16 01:45:36 UTC (rev 169997)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-06-16 03:23:55 UTC (rev 169998)
</span><span class="lines">@@ -210,6 +210,7 @@
</span><span class="cx"> navigationActionData.modifiers = InjectedBundleNavigationAction::modifiersForNavigationAction(navigationAction);
</span><span class="cx"> navigationActionData.mouseButton = InjectedBundleNavigationAction::mouseButtonForNavigationAction(navigationAction);
</span><span class="cx"> navigationActionData.isProcessingUserGesture = navigationAction.processingUserGesture();
</span><ins>+ navigationActionData.canHandleRequest = m_page->canHandleRequest(request.resourceRequest());
</ins><span class="cx">
</span><span class="cx"> uint64_t newPageID = 0;
</span><span class="cx"> WebPageCreationParameters parameters;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (169997 => 169998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-06-16 01:45:36 UTC (rev 169997)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-06-16 03:23:55 UTC (rev 169998)
</span><span class="lines">@@ -699,6 +699,7 @@
</span><span class="cx"> navigationActionData.modifiers = action->modifiers();
</span><span class="cx"> navigationActionData.mouseButton = action->mouseButton();
</span><span class="cx"> navigationActionData.isProcessingUserGesture = navigationAction.processingUserGesture();
</span><ins>+ navigationActionData.canHandleRequest = webPage->canHandleRequest(request);
</ins><span class="cx">
</span><span class="cx"> webPage->send(Messages::WebPageProxy::DecidePolicyForNewWindowAction(m_frame->frameID(), navigationActionData, request, frameName, listenerID, InjectedBundleUserMessageEncoder(userData.get())));
</span><span class="cx"> }
</span><span class="lines">@@ -758,6 +759,7 @@
</span><span class="cx"> navigationActionData.modifiers = action->modifiers();
</span><span class="cx"> navigationActionData.mouseButton = action->mouseButton();
</span><span class="cx"> navigationActionData.isProcessingUserGesture = navigationAction.processingUserGesture();
</span><ins>+ navigationActionData.canHandleRequest = webPage->canHandleRequest(request);
</ins><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><span class="cx"> if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), navigationActionData, originatingFrame ? originatingFrame->frameID() : 0, navigationAction.resourceRequest(), request, listenerID, InjectedBundleUserMessageEncoder(userData.get())), Messages::WebPageProxy::DecidePolicyForNavigationAction::Reply(receivedPolicyAction, policyAction, downloadID)))
</span></span></pre>
</div>
</div>
</body>
</html>