<!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>[194536] 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/194536">194536</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-01-04 10:16:39 -0800 (Mon, 04 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards implementing downloads with NetworkSession
https://bugs.webkit.org/show_bug.cgi?id=152576
Reviewed by Brady Eidson.
* NetworkProcess/Downloads/Download.cpp:
(WebKit::Download::Download):
(WebKit::Download::~Download):
(WebKit::Download::didStart):
(WebKit::Download::didReceiveAuthenticationChallenge):
* NetworkProcess/Downloads/Download.h:
(WebKit::Download::downloadID):
* NetworkProcess/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::startDownload):
(WebKit::DownloadManager::dataTaskBecameDownloadTask):
(WebKit::DownloadManager::convertHandleToDownload):
* NetworkProcess/Downloads/DownloadManager.h:
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload):
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::convertTaskToDownload):
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/NetworkSession.h:
(WebKit::NetworkDataTask::client):
(WebKit::NetworkDataTask::clearClient):
(WebKit::NetworkDataTask::downloadID):
(WebKit::NetworkDataTask::setDownloadID):
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:downloadTask:didWriteData:totalBytesWritten:totalBytesExpectedToWrite:]):
(-[WKNetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadh">trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadcpp">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadh">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkSessionh">trunk/Source/WebKit2/NetworkProcess/NetworkSession.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194535 => 194536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-04 18:10:06 UTC (rev 194535)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-04 18:16:39 UTC (rev 194536)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-01-04 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards implementing downloads with NetworkSession
+ https://bugs.webkit.org/show_bug.cgi?id=152576
+
+ Reviewed by Brady Eidson.
+
+ * NetworkProcess/Downloads/Download.cpp:
+ (WebKit::Download::Download):
+ (WebKit::Download::~Download):
+ (WebKit::Download::didStart):
+ (WebKit::Download::didReceiveAuthenticationChallenge):
+ * NetworkProcess/Downloads/Download.h:
+ (WebKit::Download::downloadID):
+ * NetworkProcess/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::startDownload):
+ (WebKit::DownloadManager::dataTaskBecameDownloadTask):
+ (WebKit::DownloadManager::convertHandleToDownload):
+ * NetworkProcess/Downloads/DownloadManager.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload):
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::convertTaskToDownload):
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/NetworkSession.h:
+ (WebKit::NetworkDataTask::client):
+ (WebKit::NetworkDataTask::clearClient):
+ (WebKit::NetworkDataTask::downloadID):
+ (WebKit::NetworkDataTask::setDownloadID):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:downloadTask:didWriteData:totalBytesWritten:totalBytesExpectedToWrite:]):
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):
+
</ins><span class="cx"> 2016-01-04 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Rename _WebKitWebContextPrivate.context to _WebKitWebContextPrivate.processPool
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (194535 => 194536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-01-04 18:10:06 UTC (rev 194535)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-01-04 18:16:39 UTC (rev 194536)
</span><span class="lines">@@ -44,15 +44,16 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>-Download::Download(DownloadManager& downloadManager, const NetworkSession& session, DownloadID downloadID, const ResourceRequest& request)
</del><ins>+Download::Download(DownloadManager& downloadManager, const NetworkSession& session, DownloadID downloadID)
</ins><span class="cx"> #else
</span><span class="cx"> Download::Download(DownloadManager& downloadManager, DownloadID downloadID, const ResourceRequest& request)
</span><span class="cx"> #endif
</span><span class="cx"> : m_downloadManager(downloadManager)
</span><span class="cx"> , m_downloadID(downloadID)
</span><del>- , m_request(request)
</del><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> , m_session(session)
</span><ins>+#else
+ , m_request(request)
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_downloadID.downloadID());
</span><span class="lines">@@ -67,10 +68,17 @@
</span><span class="cx"> m_downloadManager.didDestroyDownload();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(NETWORK_SESSION)
+void Download::didStart(const ResourceRequest& request)
+{
+ send(Messages::DownloadProxy::DidStart(request));
+}
+#else
</ins><span class="cx"> void Download::didStart()
</span><span class="cx"> {
</span><span class="cx"> send(Messages::DownloadProxy::DidStart(m_request));
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void Download::didReceiveAuthenticationChallenge(const AuthenticationChallenge& authenticationChallenge)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h (194535 => 194536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-01-04 18:10:06 UTC (rev 194535)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-01-04 18:16:39 UTC (rev 194536)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(Download);
</span><span class="cx"> public:
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- Download(DownloadManager&, const NetworkSession&, DownloadID, const WebCore::ResourceRequest&);
</del><ins>+ Download(DownloadManager&, const NetworkSession&, DownloadID);
</ins><span class="cx"> #else
</span><span class="cx"> Download(DownloadManager&, DownloadID, const WebCore::ResourceRequest&);
</span><span class="cx"> #endif
</span><span class="lines">@@ -94,7 +94,11 @@
</span><span class="cx">
</span><span class="cx"> DownloadID downloadID() const { return m_downloadID; }
</span><span class="cx">
</span><ins>+#if USE(NETWORK_SESSION)
+ void didStart(const WebCore::ResourceRequest&);
+#else
</ins><span class="cx"> void didStart();
</span><ins>+#endif
</ins><span class="cx"> void didReceiveAuthenticationChallenge(const WebCore::AuthenticationChallenge&);
</span><span class="cx"> void didReceiveResponse(const WebCore::ResourceResponse&);
</span><span class="cx"> void didReceiveData(uint64_t length);
</span><span class="lines">@@ -130,7 +134,9 @@
</span><span class="cx">
</span><span class="cx"> DownloadManager& m_downloadManager;
</span><span class="cx"> DownloadID m_downloadID;
</span><ins>+#if !USE(NETWORK_SESSION)
</ins><span class="cx"> WebCore::ResourceRequest m_request;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> RefPtr<SandboxExtension> m_sandboxExtension;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (194535 => 194536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-01-04 18:10:06 UTC (rev 194535)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-01-04 18:16:39 UTC (rev 194536)
</span><span class="lines">@@ -47,7 +47,8 @@
</span><span class="cx"> auto* networkSession = SessionTracker::networkSession(sessionID);
</span><span class="cx"> if (!networkSession)
</span><span class="cx"> return;
</span><del>- auto download = std::make_unique<Download>(*this, *networkSession, downloadID, request);
</del><ins>+ auto download = std::make_unique<Download>(*this, *networkSession, downloadID);
+ download->didStart(request);
</ins><span class="cx"> #else
</span><span class="cx"> auto download = std::make_unique<Download>(*this, downloadID, request);
</span><span class="cx"> #endif
</span><span class="lines">@@ -57,7 +58,12 @@
</span><span class="cx"> m_downloads.add(downloadID, WTFMove(download));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !USE(NETWORK_SESSION)
</del><ins>+#if USE(NETWORK_SESSION)
+void DownloadManager::dataTaskBecameDownloadTask(DownloadID downloadID, std::unique_ptr<Download>&& download)
+{
+ m_downloads.add(downloadID, WTF::move(download));
+}
+#else
</ins><span class="cx"> void DownloadManager::convertHandleToDownload(DownloadID downloadID, ResourceHandle* handle, const ResourceRequest& request, const ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> auto download = std::make_unique<Download>(*this, downloadID, request);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (194535 => 194536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-01-04 18:10:06 UTC (rev 194535)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-01-04 18:16:39 UTC (rev 194536)
</span><span class="lines">@@ -71,7 +71,9 @@
</span><span class="cx"> explicit DownloadManager(Client*);
</span><span class="cx">
</span><span class="cx"> void startDownload(WebCore::SessionID, DownloadID, const WebCore::ResourceRequest&);
</span><del>-#if !USE(NETWORK_SESSION)
</del><ins>+#if USE(NETWORK_SESSION)
+ void dataTaskBecameDownloadTask(DownloadID, std::unique_ptr<Download>&&);
+#else
</ins><span class="cx"> void convertHandleToDownload(DownloadID, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (194535 => 194536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2016-01-04 18:10:06 UTC (rev 194535)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2016-01-04 18:16:39 UTC (rev 194536)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- loader->networkLoad()->convertTaskToDownload();
</del><ins>+ loader->networkLoad()->convertTaskToDownload(downloadID);
</ins><span class="cx"> #else
</span><span class="cx"> networkProcess.downloadManager().convertHandleToDownload(downloadID, loader->networkLoad()->handle(), request, response);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (194535 => 194536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-01-04 18:10:06 UTC (rev 194535)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-01-04 18:16:39 UTC (rev 194536)
</span><span class="lines">@@ -156,8 +156,10 @@
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx">
</span><del>-void NetworkLoad::convertTaskToDownload()
</del><ins>+void NetworkLoad::convertTaskToDownload(DownloadID downloadID)
</ins><span class="cx"> {
</span><ins>+ m_task->setDownloadID(downloadID);
+
</ins><span class="cx"> ASSERT(m_responseCompletionHandler);
</span><span class="cx"> m_responseCompletionHandler(PolicyDownload);
</span><span class="cx"> m_responseCompletionHandler = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (194535 => 194536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-01-04 18:10:06 UTC (rev 194535)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-01-04 18:16:39 UTC (rev 194536)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "RemoteNetworkingContext.h"
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><ins>+#include "DownloadID.h"
</ins><span class="cx"> #include "NetworkSession.h"
</span><span class="cx"> #include <WebCore/AuthenticationChallenge.h>
</span><span class="cx"> #else
</span><span class="lines">@@ -60,7 +61,7 @@
</span><span class="cx"> void continueDidReceiveResponse();
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- void convertTaskToDownload();
</del><ins>+ void convertTaskToDownload(DownloadID);
</ins><span class="cx">
</span><span class="cx"> // NetworkSessionTaskClient.
</span><span class="cx"> virtual void willPerformHTTPRedirection(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, std::function<void(const WebCore::ResourceRequest&)>) final override;
</span><span class="lines">@@ -124,6 +125,7 @@
</span><span class="cx"> ChallengeCompletionHandler m_challengeCompletionHandler;
</span><span class="cx"> ResponseCompletionHandler m_responseCompletionHandler;
</span><span class="cx"> RedirectCompletionHandler m_redirectCompletionHandler;
</span><ins>+ DownloadID m_downloadID;
</ins><span class="cx"> #else
</span><span class="cx"> RefPtr<WebCore::ResourceHandle> m_handle;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkSession.h (194535 => 194536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2016-01-04 18:10:06 UTC (rev 194535)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2016-01-04 18:16:39 UTC (rev 194536)
</span><span class="lines">@@ -91,9 +91,18 @@
</span><span class="cx"> NetworkSessionTaskClient* client() { return m_client; }
</span><span class="cx"> void clearClient() { m_client = nullptr; }
</span><span class="cx">
</span><ins>+ DownloadID downloadID() { return m_downloadID; }
+ void setDownloadID(DownloadID downloadID)
+ {
+ ASSERT(!m_downloadID.downloadID());
+ ASSERT(downloadID.downloadID());
+ m_downloadID = downloadID;
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> NetworkSession& m_session;
</span><span class="cx"> NetworkSessionTaskClient* m_client;
</span><ins>+ DownloadID m_downloadID;
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> explicit NetworkDataTask(NetworkSession&, NetworkSessionTaskClient&, RetainPtr<NSURLSessionDataTask>&&);
</span><span class="cx"> RetainPtr<NSURLSessionDataTask> m_task;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (194535 => 194536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-01-04 18:10:06 UTC (rev 194535)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-01-04 18:16:39 UTC (rev 194536)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx">
</span><ins>+#import "NetworkProcess.h"
</ins><span class="cx"> #import "SessionTracker.h"
</span><span class="cx"> #import <Foundation/NSURLSession.h>
</span><span class="cx"> #import <WebCore/AuthenticationChallenge.h>
</span><span class="lines">@@ -183,10 +184,16 @@
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didBecomeDownloadTask:(NSURLSessionDownloadTask *)downloadTask
</span><span class="cx"> {
</span><del>- auto* networkDataTask = _session->dataTaskForIdentifier([dataTask taskIdentifier]);
- ASSERT(networkDataTask);
- if (auto* client = networkDataTask->client())
- client->didBecomeDownload();
</del><ins>+ if (auto* networkDataTask = _session->dataTaskForIdentifier([dataTask taskIdentifier])) {
+ auto downloadID = networkDataTask->downloadID();
+ auto& downloadManager = WebKit::NetworkProcess::singleton().downloadManager();
+ auto download = std::make_unique<WebKit::Download>(downloadManager, *_session, downloadID);
+ download->didStart([downloadTask currentRequest]);
+ downloadManager.dataTaskBecameDownloadTask(downloadID, WTF::move(download));
+
+ if (auto* client = networkDataTask->client())
+ client->didBecomeDownload();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>