<!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>[184376] trunk/Source</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/184376">184376</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-15 01:03:16 -0700 (Fri, 15 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/183861">r183861</a>): [SOUP] Downloads are broken when using the Network Process
https://bugs.webkit.org/show_bug.cgi?id=144738
Reviewed by Alexey Proskuryakov.
Source/WebCore:
Add ResourceHandle::releaseForDownload() that releases the current
handle to be used as a download.
* platform/network/ResourceHandle.h:
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::ResourceHandle::releaseForDownload):
Source/WebKit2:
When converting the main resource handle to a download, the
NetworkResourceLoader is aborted, and the ResourceHandle is
cleaned up aborting the download operation. We need to use a
different ResourceHandle for the download operation.
* Shared/Downloads/soup/DownloadSoup.cpp:
(WebKit::Download::startWithHandle): Use ResourceHandle::releaseForDownload()
instead of reusing the given handle.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadssoupDownloadSoupcpp">trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184375 => 184376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-15 08:01:42 UTC (rev 184375)
+++ trunk/Source/WebCore/ChangeLog 2015-05-15 08:03:16 UTC (rev 184376)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-05-14 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(r183861): [SOUP] Downloads are broken when using the Network Process
+ https://bugs.webkit.org/show_bug.cgi?id=144738
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add ResourceHandle::releaseForDownload() that releases the current
+ handle to be used as a download.
+
+ * platform/network/ResourceHandle.h:
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::ResourceHandle::releaseForDownload):
+
</ins><span class="cx"> 2015-05-15 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix PlatformDisplayWayland construction error, implement the destructor
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (184375 => 184376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2015-05-15 08:01:42 UTC (rev 184375)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2015-05-15 08:03:16 UTC (rev 184376)
</span><span class="lines">@@ -177,6 +177,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><ins>+ RefPtr<ResourceHandle> releaseForDownload(ResourceHandleClient*);
</ins><span class="cx"> void continueDidReceiveAuthenticationChallenge(const Credential& credentialFromPersistentStorage);
</span><span class="cx"> void sendPendingRequest();
</span><span class="cx"> bool cancelledOrClientless();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (184375 => 184376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2015-05-15 08:01:42 UTC (rev 184375)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2015-05-15 08:03:16 UTC (rev 184376)
</span><span class="lines">@@ -1027,6 +1027,21 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<ResourceHandle> ResourceHandle::releaseForDownload(ResourceHandleClient* downloadClient)
+{
+ // We don't adopt the ref, as it will be released by cleanupSoupRequestOperation, which should always run.
+ RefPtr<ResourceHandle> newHandle = new ResourceHandle(d->m_context.get(), firstRequest(), nullptr, d->m_defersLoading, d->m_shouldContentSniff);
+ std::swap(d, newHandle->d);
+
+ g_signal_handlers_disconnect_matched(newHandle->d->m_soupMessage.get(), G_SIGNAL_MATCH_DATA, 0, 0, nullptr, nullptr, this);
+ g_object_set_data(G_OBJECT(newHandle->d->m_soupMessage.get()), "handle", newHandle.get());
+
+ newHandle->d->m_client = downloadClient;
+ continueAfterDidReceiveResponse(newHandle.get());
+
+ return newHandle;
+}
+
</ins><span class="cx"> void ResourceHandle::sendPendingRequest()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184375 => 184376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-15 08:01:42 UTC (rev 184375)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-15 08:03:16 UTC (rev 184376)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-05-14 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(r183861): [SOUP] Downloads are broken when using the Network Process
+ https://bugs.webkit.org/show_bug.cgi?id=144738
+
+ Reviewed by Alexey Proskuryakov.
+
+ When converting the main resource handle to a download, the
+ NetworkResourceLoader is aborted, and the ResourceHandle is
+ cleaned up aborting the download operation. We need to use a
+ different ResourceHandle for the download operation.
+
+ * Shared/Downloads/soup/DownloadSoup.cpp:
+ (WebKit::Download::startWithHandle): Use ResourceHandle::releaseForDownload()
+ instead of reusing the given handle.
+
</ins><span class="cx"> 2015-05-14 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename connectionDidClose and related methods to be more clear.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadssoupDownloadSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp (184375 => 184376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp 2015-05-15 08:01:42 UTC (rev 184375)
+++ trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp 2015-05-15 08:03:16 UTC (rev 184376)
</span><span class="lines">@@ -230,8 +230,7 @@
</span><span class="cx"> ASSERT(!m_downloadClient);
</span><span class="cx"> ASSERT(!m_resourceHandle);
</span><span class="cx"> m_downloadClient = std::make_unique<DownloadClient>(this);
</span><del>- resourceHandle->setClient(m_downloadClient.get());
- m_resourceHandle = resourceHandle;
</del><ins>+ m_resourceHandle = resourceHandle->releaseForDownload(m_downloadClient.get());
</ins><span class="cx"> didStart();
</span><span class="cx"> static_cast<DownloadClient*>(m_downloadClient.get())->handleResponseLater(response);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>