<!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>[183049] branches/safari-600.1.4.16-branch/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/183049">183049</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-04-20 22:30:25 -0700 (Mon, 20 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/181991">r181991</a>. rdar://problem/20545917</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001416branchSourceWebKit2ChangeLog">branches/safari-600.1.4.16-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001416branchSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001416branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebKit2/ChangeLog (183048 => 183049)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebKit2/ChangeLog 2015-04-21 05:20:48 UTC (rev 183048)
+++ branches/safari-600.1.4.16-branch/Source/WebKit2/ChangeLog 2015-04-21 05:30:25 UTC (rev 183049)
</span><span class="lines">@@ -1,5 +1,58 @@
</span><span class="cx"> 2015-04-20 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r181991
+
+ 2015-03-25 Chris Dumez <cdumez@apple.com>
+
+ [WK2] WebFrameLoaderClient::dispatchDecidePolicyForResponse() should always call the FramePolicyFunction
+ https://bugs.webkit.org/show_bug.cgi?id=143036
+ <rdar://problem/20252438>
+ <rdar://problem/13811738>
+
+ Reviewed by Alexey Proskuryakov.
+
+ WebFrameLoaderClient::dispatchDecidePolicyForResponse() should always
+ call the FramePolicyFunction. Previously, it would fail to do in 2
+ cases:
+ - m_frame->page() returns null
+ or
+ - webPage->sendSync() returns false
+
+ If the FramePolicyFunction is not called, we will fail to clear the
+ callback in the PolicyChecker and
+ DocumentLoader::continueAfterContentPolicy() will not be called.
+
+ DocumentLoader::continueAfterContentPolicy() is in charge of resetting
+ m_waitingForContentPolicy flag to false. This could therefore explain
+ the following assertion being hit in DocumentLoader::detachFromFrame()
+ (see <rdar://problem/20252438>):
+ RELEASE_ASSERT(!m_waitingForContentPolicy)
+
+ Also, as the PolicyChecker callback is not cleared, it could make it
+ possible for DocumentLoader::continueAfterContentPolicy() to be called
+ *after* the load is finished, when later canceling the PolicyCallback:
+ FrameLoader::stopAllLoaders()
+ -> PolicyChecker::stopCheck()
+ -> PolicyCallback::cancel()
+ -> DocumentLoader::continueAfterContentPolicy(PolicyIgnore)
+
+ Calling continueAfterContentPolicy(PolicyIgnore) after the load is
+ finished would be bad and could explain some of the crashes we've seen
+ in DocumentLoader::continueAfterContentPolicy() ->
+ DocumentLoader:: stopLoadingForPolicyChange() (see
+ <rdar://problem/13811738>).
+
+ This patch also applies the same fix to
+ dispatchDecidePolicyForNewWindowAction() and
+ dispatchDecidePolicyForNavigationAction() as they use the same pattern.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+
+2015-04-20 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r181919
</span><span class="cx">
</span><span class="cx"> 2015-03-24 Enrica Casucci <enrica@apple.com>
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (183048 => 183049)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-04-21 05:20:48 UTC (rev 183048)
+++ branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-04-21 05:30:25 UTC (rev 183049)
</span><span class="lines">@@ -656,8 +656,10 @@
</span><span class="cx"> void WebFrameLoaderClient::dispatchDecidePolicyForResponse(const ResourceResponse& response, const ResourceRequest& request, FramePolicyFunction function)
</span><span class="cx"> {
</span><span class="cx"> WebPage* webPage = m_frame->page();
</span><del>- if (!webPage)
</del><ins>+ if (!webPage) {
+ function(PolicyIgnore);
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if (!request.url().string()) {
</span><span class="cx"> function(PolicyUse);
</span><span class="lines">@@ -683,8 +685,10 @@
</span><span class="cx"> unsigned syncSendFlags = IPC::InformPlatformProcessWillSuspend;
</span><span class="cx"> if (WebPage::synchronousMessagesShouldSpinRunLoop())
</span><span class="cx"> syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
</span><del>- if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), response, request, canShowMIMEType, listenerID, InjectedBundleUserMessageEncoder(userData.get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), std::chrono::milliseconds::max(), syncSendFlags))
</del><ins>+ if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), response, request, canShowMIMEType, listenerID, InjectedBundleUserMessageEncoder(userData.get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), std::chrono::milliseconds::max(), syncSendFlags)) {
+ function(PolicyIgnore);
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // We call this synchronously because CFNetwork can only convert a loading connection to a download from its didReceiveResponse callback.
</span><span class="cx"> if (receivedPolicyAction)
</span><span class="lines">@@ -694,8 +698,10 @@
</span><span class="cx"> void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(const NavigationAction& navigationAction, const ResourceRequest& request, PassRefPtr<FormState> formState, const String& frameName, FramePolicyFunction function)
</span><span class="cx"> {
</span><span class="cx"> WebPage* webPage = m_frame->page();
</span><del>- if (!webPage)
</del><ins>+ if (!webPage) {
+ function(PolicyIgnore);
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> RefPtr<API::Object> userData;
</span><span class="cx">
</span><span class="lines">@@ -724,8 +730,10 @@
</span><span class="cx"> void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(const NavigationAction& navigationAction, const ResourceRequest& request, PassRefPtr<FormState> prpFormState, FramePolicyFunction function)
</span><span class="cx"> {
</span><span class="cx"> WebPage* webPage = m_frame->page();
</span><del>- if (!webPage)
</del><ins>+ if (!webPage) {
+ function(PolicyIgnore);
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Always ignore requests with empty URLs.
</span><span class="cx"> if (request.isEmpty()) {
</span><span class="lines">@@ -785,8 +793,10 @@
</span><span class="cx"> documentLoader = static_cast<WebDocumentLoader*>(coreFrame->loader().documentLoader());
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), documentLoader->navigationID(), navigationActionData, originatingFrame ? originatingFrame->frameID() : 0, navigationAction.resourceRequest(), request, listenerID, InjectedBundleUserMessageEncoder(userData.get())), Messages::WebPageProxy::DecidePolicyForNavigationAction::Reply(receivedPolicyAction, newNavigationID, policyAction, downloadID)))
</del><ins>+ if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), documentLoader->navigationID(), navigationActionData, originatingFrame ? originatingFrame->frameID() : 0, navigationAction.resourceRequest(), request, listenerID, InjectedBundleUserMessageEncoder(userData.get())), Messages::WebPageProxy::DecidePolicyForNavigationAction::Reply(receivedPolicyAction, newNavigationID, policyAction, downloadID))) {
+ function(PolicyIgnore);
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // We call this synchronously because WebCore cannot gracefully handle a frame load without a synchronous navigation policy reply.
</span><span class="cx"> if (receivedPolicyAction)
</span></span></pre>
</div>
</div>
</body>
</html>