<!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>[194570] 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/194570">194570</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-01-04 18:25:53 -0800 (Mon, 04 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use unique_ptr for NetworkDataTasks and references for NetworkSessionTaskClients
https://bugs.webkit.org/show_bug.cgi?id=152724
Reviewed by Andy Estes.
There is no reason to have a NetworkSessionTaskClient* instead of a
NetworkSessionTaskClient& just so we can clear it in the NetworkLoad destructor,
which immediately calls ~NetworkDataTask.
Also, NetworkDataTasks are owned only by the NetworkLoad, so there's no reason to refcount them.
* NetworkProcess/Downloads/Download.h:
* NetworkProcess/Downloads/DownloadManager.h:
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::~NetworkLoad):
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/NetworkSession.h:
(WebKit::NetworkSessionTaskClient::~NetworkSessionTaskClient):
(WebKit::NetworkDataTask::client):
(WebKit::NetworkDataTask::downloadID):
(WebKit::NetworkDataTask::setDownloadID):
(WebKit::NetworkDataTask::clearClient): Deleted.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:]):
(-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
(-[WKNetworkSessionDelegate URLSession:task:didCompleteWithError:]):
(-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):
(-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveData:]):
(-[WKNetworkSessionDelegate URLSession:downloadTask:didFinishDownloadingToURL:]):
(-[WKNetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):
(WebKit::NetworkSession::~NetworkSession):
(WebKit::NetworkSession::createDataTaskWithRequest):
(WebKit::NetworkSession::dataTaskForIdentifier):
(WebKit::NetworkDataTask::NetworkDataTask):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadh">trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h</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 (194569 => 194570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-05 02:16:48 UTC (rev 194569)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-05 02:25:53 UTC (rev 194570)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2016-01-04 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Use unique_ptr for NetworkDataTasks and references for NetworkSessionTaskClients
+ https://bugs.webkit.org/show_bug.cgi?id=152724
+
+ Reviewed by Andy Estes.
+
+ There is no reason to have a NetworkSessionTaskClient* instead of a
+ NetworkSessionTaskClient& just so we can clear it in the NetworkLoad destructor,
+ which immediately calls ~NetworkDataTask.
+ Also, NetworkDataTasks are owned only by the NetworkLoad, so there's no reason to refcount them.
+
+ * NetworkProcess/Downloads/Download.h:
+ * NetworkProcess/Downloads/DownloadManager.h:
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::~NetworkLoad):
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/NetworkSession.h:
+ (WebKit::NetworkSessionTaskClient::~NetworkSessionTaskClient):
+ (WebKit::NetworkDataTask::client):
+ (WebKit::NetworkDataTask::downloadID):
+ (WebKit::NetworkDataTask::setDownloadID):
+ (WebKit::NetworkDataTask::clearClient): Deleted.
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:]):
+ (-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
+ (-[WKNetworkSessionDelegate URLSession:task:didCompleteWithError:]):
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveData:]):
+ (-[WKNetworkSessionDelegate URLSession:downloadTask:didFinishDownloadingToURL:]):
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):
+ (WebKit::NetworkSession::~NetworkSession):
+ (WebKit::NetworkSession::createDataTaskWithRequest):
+ (WebKit::NetworkSession::dataTaskForIdentifier):
+ (WebKit::NetworkDataTask::NetworkDataTask):
+
+2016-01-04 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Progress towards implementing downloads with NetworkSession
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152716
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h (194569 => 194570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-01-05 02:16:48 UTC (rev 194569)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-01-05 02:25:53 UTC (rev 194570)
</span><span class="lines">@@ -69,7 +69,6 @@
</span><span class="cx">
</span><span class="cx"> class DownloadAuthenticationClient;
</span><span class="cx"> class DownloadManager;
</span><del>-class NetworkDataTask;
</del><span class="cx"> class NetworkSession;
</span><span class="cx"> class WebPage;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (194569 => 194570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-01-05 02:16:48 UTC (rev 194569)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-01-05 02:25:53 UTC (rev 194570)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx">
</span><span class="cx"> class AuthenticationManager;
</span><span class="cx"> class Download;
</span><del>-class NetworkDataTask;
</del><span class="cx"> class WebPage;
</span><span class="cx">
</span><span class="cx"> class DownloadManager {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (194569 => 194570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-01-05 02:16:48 UTC (rev 194569)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-01-05 02:25:53 UTC (rev 194570)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> if (m_responseCompletionHandler)
</span><span class="cx"> m_responseCompletionHandler(PolicyIgnore);
</span><del>- m_task->clearClient();
</del><span class="cx"> #else
</span><span class="cx"> if (m_handle)
</span><span class="cx"> m_handle->clearClient();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (194569 => 194570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-01-05 02:16:48 UTC (rev 194569)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-01-05 02:25:53 UTC (rev 194570)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> const NetworkLoadParameters m_parameters;
</span><span class="cx"> RefPtr<RemoteNetworkingContext> m_networkingContext;
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- Ref<NetworkDataTask> m_task;
</del><ins>+ std::unique_ptr<NetworkDataTask> m_task;
</ins><span class="cx"> WebCore::AuthenticationChallenge m_challenge;
</span><span class="cx"> ChallengeCompletionHandler m_challengeCompletionHandler;
</span><span class="cx"> ResponseCompletionHandler m_responseCompletionHandler;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkSession.h (194569 => 194570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2016-01-05 02:16:48 UTC (rev 194569)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2016-01-05 02:25:53 UTC (rev 194570)
</span><span class="lines">@@ -77,9 +77,15 @@
</span><span class="cx"> virtual ~NetworkSessionTaskClient() { }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class NetworkDataTask : public RefCounted<NetworkDataTask> {
</del><ins>+class NetworkDataTask {
</ins><span class="cx"> friend class NetworkSession;
</span><span class="cx"> public:
</span><ins>+#if PLATFORM(COCOA)
+ explicit NetworkDataTask(NetworkSession&, NetworkSessionTaskClient&, RetainPtr<NSURLSessionDataTask>&&);
+#else
+ explicit NetworkDataTask(NetworkSession&, NetworkSessionTaskClient&);
+#endif
+
</ins><span class="cx"> void cancel();
</span><span class="cx"> void resume();
</span><span class="cx">
</span><span class="lines">@@ -88,8 +94,7 @@
</span><span class="cx">
</span><span class="cx"> ~NetworkDataTask();
</span><span class="cx">
</span><del>- NetworkSessionTaskClient* client() { return m_client; }
- void clearClient() { m_client = nullptr; }
</del><ins>+ NetworkSessionTaskClient& client() { return m_client; }
</ins><span class="cx">
</span><span class="cx"> DownloadID downloadID() { return m_downloadID; }
</span><span class="cx"> void setDownloadID(DownloadID downloadID)
</span><span class="lines">@@ -101,13 +106,10 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NetworkSession& m_session;
</span><del>- NetworkSessionTaskClient* m_client;
</del><ins>+ NetworkSessionTaskClient& m_client;
</ins><span class="cx"> DownloadID m_downloadID;
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- explicit NetworkDataTask(NetworkSession&, NetworkSessionTaskClient&, RetainPtr<NSURLSessionDataTask>&&);
</del><span class="cx"> RetainPtr<NSURLSessionDataTask> m_task;
</span><del>-#else
- explicit NetworkDataTask(NetworkSession&, NetworkSessionTaskClient&);
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -123,7 +125,7 @@
</span><span class="cx">
</span><span class="cx"> static NetworkSession& defaultSession();
</span><span class="cx">
</span><del>- Ref<NetworkDataTask> createDataTaskWithRequest(const WebCore::ResourceRequest&, NetworkSessionTaskClient&);
</del><ins>+ std::unique_ptr<NetworkDataTask> createDataTaskWithRequest(const WebCore::ResourceRequest&, NetworkSessionTaskClient&);
</ins><span class="cx">
</span><span class="cx"> NetworkDataTask* dataTaskForIdentifier(NetworkDataTask::TaskIdentifier);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (194569 => 194570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-01-05 02:16:48 UTC (rev 194569)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-01-05 02:25:53 UTC (rev 194570)
</span><span class="lines">@@ -94,66 +94,50 @@
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task willPerformHTTPRedirection:(NSHTTPURLResponse *)response newRequest:(NSURLRequest *)request completionHandler:(void (^)(NSURLRequest *))completionHandler
</span><span class="cx"> {
</span><del>- if (auto* networkingTask = _session->dataTaskForIdentifier(task.taskIdentifier)) {
- if (auto* client = networkingTask->client()) {
- auto completionHandlerCopy = Block_copy(completionHandler);
- client->willPerformHTTPRedirection(response, request, [completionHandlerCopy](const WebCore::ResourceRequest& request)
- {
- completionHandlerCopy(request.nsURLRequest(WebCore::UpdateHTTPBody));
- Block_release(completionHandlerCopy);
- }
- );
- }
</del><ins>+ if (auto* networkDataTask = _session->dataTaskForIdentifier(task.taskIdentifier)) {
+ auto completionHandlerCopy = Block_copy(completionHandler);
+ networkDataTask->client().willPerformHTTPRedirection(response, request, [completionHandlerCopy](const WebCore::ResourceRequest& request) {
+ completionHandlerCopy(request.nsURLRequest(WebCore::UpdateHTTPBody));
+ Block_release(completionHandlerCopy);
+ });
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler
</span><span class="cx"> {
</span><del>- if (auto* networkingTask = _session->dataTaskForIdentifier(task.taskIdentifier)) {
- if (auto* client = networkingTask->client()) {
- auto completionHandlerCopy = Block_copy(completionHandler);
- client->didReceiveChallenge(challenge, [completionHandlerCopy](WebKit::AuthenticationChallengeDisposition disposition, const WebCore::Credential& credential)
- {
- completionHandlerCopy(toNSURLSessionAuthChallengeDisposition(disposition), credential.nsCredential());
- Block_release(completionHandlerCopy);
- }
- );
- }
</del><ins>+ if (auto* networkDataTask = _session->dataTaskForIdentifier(task.taskIdentifier)) {
+ auto completionHandlerCopy = Block_copy(completionHandler);
+ networkDataTask->client().didReceiveChallenge(challenge, [completionHandlerCopy](WebKit::AuthenticationChallengeDisposition disposition, const WebCore::Credential& credential) {
+ completionHandlerCopy(toNSURLSessionAuthChallengeDisposition(disposition), credential.nsCredential());
+ Block_release(completionHandlerCopy);
+ });
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error
</span><span class="cx"> {
</span><del>- if (auto* networkingTask = _session->dataTaskForIdentifier(task.taskIdentifier)) {
- if (auto* client = networkingTask->client())
- client->didCompleteWithError(error);
- }
</del><ins>+ if (auto* networkDataTask = _session->dataTaskForIdentifier(task.taskIdentifier))
+ networkDataTask->client().didCompleteWithError(error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveResponse:(NSURLResponse *)response completionHandler:(void (^)(NSURLSessionResponseDisposition disposition))completionHandler
</span><span class="cx"> {
</span><del>- if (auto* networkingTask = _session->dataTaskForIdentifier(dataTask.taskIdentifier)) {
- if (auto* client = networkingTask->client()) {
- ASSERT(isMainThread());
- WebCore::ResourceResponse resourceResponse(response);
- copyTimingData([dataTask _timingData], resourceResponse.resourceLoadTiming());
- auto completionHandlerCopy = Block_copy(completionHandler);
- client->didReceiveResponse(resourceResponse, [completionHandlerCopy](WebCore::PolicyAction policyAction)
- {
- completionHandlerCopy(toNSURLSessionResponseDisposition(policyAction));
- Block_release(completionHandlerCopy);
- }
- );
- }
</del><ins>+ if (auto* networkDataTask = _session->dataTaskForIdentifier(dataTask.taskIdentifier)) {
+ ASSERT(isMainThread());
+ WebCore::ResourceResponse resourceResponse(response);
+ copyTimingData([dataTask _timingData], resourceResponse.resourceLoadTiming());
+ auto completionHandlerCopy = Block_copy(completionHandler);
+ networkDataTask->client().didReceiveResponse(resourceResponse, [completionHandlerCopy](WebCore::PolicyAction policyAction) {
+ completionHandlerCopy(toNSURLSessionResponseDisposition(policyAction));
+ Block_release(completionHandlerCopy);
+ });
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveData:(NSData *)data
</span><span class="cx"> {
</span><del>- if (auto* networkingTask = _session->dataTaskForIdentifier(dataTask.taskIdentifier)) {
- if (auto* client = networkingTask->client())
- client->didReceiveData(WebCore::SharedBuffer::wrapNSData(data));
- }
</del><ins>+ if (auto* networkDataTask = _session->dataTaskForIdentifier(dataTask.taskIdentifier))
+ networkDataTask->client().didReceiveData(WebCore::SharedBuffer::wrapNSData(data));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location
</span><span class="lines">@@ -188,8 +172,7 @@
</span><span class="cx"> download->didReceiveResponse([downloadTask response]);
</span><span class="cx"> downloadManager.dataTaskBecameDownloadTask(downloadID, WTFMove(download));
</span><span class="cx">
</span><del>- if (auto* client = networkDataTask->client())
- client->didBecomeDownload();
</del><ins>+ networkDataTask->client().didBecomeDownload();
</ins><span class="cx">
</span><span class="cx"> _session->addDownloadID([downloadTask taskIdentifier], downloadID);
</span><span class="cx"> }
</span><span class="lines">@@ -241,9 +224,9 @@
</span><span class="cx"> [m_session invalidateAndCancel];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<NetworkDataTask> NetworkSession::createDataTaskWithRequest(const WebCore::ResourceRequest& request, NetworkSessionTaskClient& client)
</del><ins>+std::unique_ptr<NetworkDataTask> NetworkSession::createDataTaskWithRequest(const WebCore::ResourceRequest& request, NetworkSessionTaskClient& client)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new NetworkDataTask(*this, client, [m_session dataTaskWithRequest:request.nsURLRequest(WebCore::UpdateHTTPBody)]));
</del><ins>+ return std::make_unique<NetworkDataTask>(*this, client, [m_session dataTaskWithRequest:request.nsURLRequest(WebCore::UpdateHTTPBody)]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NetworkDataTask* NetworkSession::dataTaskForIdentifier(NetworkDataTask::TaskIdentifier taskIdentifier)
</span><span class="lines">@@ -277,7 +260,7 @@
</span><span class="cx">
</span><span class="cx"> NetworkDataTask::NetworkDataTask(NetworkSession& session, NetworkSessionTaskClient& client, RetainPtr<NSURLSessionDataTask>&& task)
</span><span class="cx"> : m_session(session)
</span><del>- , m_client(&client)
</del><ins>+ , m_client(client)
</ins><span class="cx"> , m_task(WTFMove(task))
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_session.m_dataTaskMap.contains(taskIdentifier()));
</span></span></pre>
</div>
</div>
</body>
</html>