<!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>[193787] 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/193787">193787</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-08 15:05:52 -0800 (Tue, 08 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards implementing downloads with NetworkSession
https://bugs.webkit.org/show_bug.cgi?id=151883
Patch by Alex Christensen <achristensen@webkit.org> on 2015-12-08
Reviewed by Brady Eidson.
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload):
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::~NetworkLoad):
(WebKit::NetworkLoad::continueDidReceiveResponse):
(WebKit::NetworkLoad::convertTaskToDownload):
(WebKit::NetworkLoad::willPerformHTTPRedirection):
(WebKit::NetworkLoad::didReceiveChallenge):
(WebKit::NetworkLoad::didReceiveResponse):
(WebKit::NetworkLoad::didReceiveData):
(WebKit::NetworkLoad::didCompleteWithError):
(WebKit::NetworkLoad::didBecomeDownload):
(WebKit::NetworkLoad::didReceiveResponseAsync):
(WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace):
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/NetworkLoadClient.h:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::cleanup):
(WebKit::NetworkResourceLoader::didConvertToDownload):
(WebKit::NetworkResourceLoader::abort):
(WebKit::NetworkResourceLoader::didConvertHandleToDownload): Deleted.
* NetworkProcess/NetworkResourceLoader.h:
* NetworkProcess/NetworkSession.h:
(WebKit::NetworkSessionTaskClient::~NetworkSessionTaskClient):
(WebKit::NetworkSession::~NetworkSession): Deleted.
* NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[NetworkSessionDelegate URLSession:downloadTask:didWriteData:totalBytesWritten:totalBytesExpectedToWrite:]):
(-[NetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):
(WebKit::NetworkSession::NetworkSession):
(WebKit::NetworkSession::~NetworkSession):
(WebKit::NetworkSession::createDataTaskWithRequest):
* Shared/Downloads/Download.h:
* Shared/Downloads/DownloadManager.h:
(WebKit::DownloadManager::isDownloading):
(WebKit::DownloadManager::activeDownloadCount):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="#trunkSourceWebKit2NetworkProcessNetworkLoadClienth">trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkSessionh">trunk/Source/WebKit2/NetworkProcess/NetworkSession.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadsDownloadh">trunk/Source/WebKit2/Shared/Downloads/Download.h</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadsDownloadManagerh">trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (193786 => 193787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-08 23:02:58 UTC (rev 193786)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-08 23:05:52 UTC (rev 193787)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2015-12-08 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards implementing downloads with NetworkSession
+ https://bugs.webkit.org/show_bug.cgi?id=151883
+
+ Reviewed by Brady Eidson.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload):
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::~NetworkLoad):
+ (WebKit::NetworkLoad::continueDidReceiveResponse):
+ (WebKit::NetworkLoad::convertTaskToDownload):
+ (WebKit::NetworkLoad::willPerformHTTPRedirection):
+ (WebKit::NetworkLoad::didReceiveChallenge):
+ (WebKit::NetworkLoad::didReceiveResponse):
+ (WebKit::NetworkLoad::didReceiveData):
+ (WebKit::NetworkLoad::didCompleteWithError):
+ (WebKit::NetworkLoad::didBecomeDownload):
+ (WebKit::NetworkLoad::didReceiveResponseAsync):
+ (WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace):
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/NetworkLoadClient.h:
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::cleanup):
+ (WebKit::NetworkResourceLoader::didConvertToDownload):
+ (WebKit::NetworkResourceLoader::abort):
+ (WebKit::NetworkResourceLoader::didConvertHandleToDownload): Deleted.
+ * NetworkProcess/NetworkResourceLoader.h:
+ * NetworkProcess/NetworkSession.h:
+ (WebKit::NetworkSessionTaskClient::~NetworkSessionTaskClient):
+ (WebKit::NetworkSession::~NetworkSession): Deleted.
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[NetworkSessionDelegate URLSession:downloadTask:didWriteData:totalBytesWritten:totalBytesExpectedToWrite:]):
+ (-[NetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):
+ (WebKit::NetworkSession::NetworkSession):
+ (WebKit::NetworkSession::~NetworkSession):
+ (WebKit::NetworkSession::createDataTaskWithRequest):
+ * Shared/Downloads/Download.h:
+ * Shared/Downloads/DownloadManager.h:
+ (WebKit::DownloadManager::isDownloading):
+ (WebKit::DownloadManager::activeDownloadCount):
+
</ins><span class="cx"> 2015-12-08 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Create a Sandbox SPI header
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (193786 => 193787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-12-08 23:02:58 UTC (rev 193786)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-12-08 23:05:52 UTC (rev 193787)
</span><span class="lines">@@ -197,15 +197,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- // FIXME: Do something here.
- notImplemented();
</del><ins>+ loader->networkLoad()->convertTaskToDownload();
</ins><span class="cx"> #else
</span><span class="cx"> networkProcess.downloadManager().convertHandleToDownload(downloadID, loader->networkLoad()->handle(), request, response);
</span><span class="cx">
</span><span class="cx"> // Unblock the URL connection operation queue.
</span><span class="cx"> loader->networkLoad()->handle()->continueDidReceiveResponse();
</span><span class="cx">
</span><del>- loader->didConvertHandleToDownload();
</del><ins>+ loader->didConvertToDownload();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (193786 => 193787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2015-12-08 23:02:58 UTC (rev 193786)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2015-12-08 23:05:52 UTC (rev 193787)
</span><span class="lines">@@ -63,6 +63,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><ins>+ if (m_responseCompletionHandler)
+ m_responseCompletionHandler(PolicyIgnore);
</ins><span class="cx"> m_task->clearClient();
</span><span class="cx"> #else
</span><span class="cx"> if (m_handle)
</span><span class="lines">@@ -122,8 +124,9 @@
</span><span class="cx"> void NetworkLoad::continueDidReceiveResponse()
</span><span class="cx"> {
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- // FIXME: Do something here.
- notImplemented();
</del><ins>+ ASSERT(m_responseCompletionHandler);
+ m_responseCompletionHandler(PolicyUse);
+ m_responseCompletionHandler = nullptr;
</ins><span class="cx"> #else
</span><span class="cx"> m_handle->continueDidReceiveResponse();
</span><span class="cx"> #endif
</span><span class="lines">@@ -151,6 +154,13 @@
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx">
</span><ins>+void NetworkLoad::convertTaskToDownload()
+{
+ ASSERT(m_responseCompletionHandler);
+ m_responseCompletionHandler(PolicyDownload);
+ m_responseCompletionHandler = nullptr;
+}
+
</ins><span class="cx"> void NetworkLoad::willPerformHTTPRedirection(const ResourceResponse& response, const ResourceRequest& request, std::function<void(const ResourceRequest&)> completionHandler)
</span><span class="cx"> {
</span><span class="cx"> sharedWillSendRedirectedRequest(request, response);
</span><span class="lines">@@ -177,16 +187,18 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_completionHandler = completionHandler;
</del><ins>+ m_challengeCompletionHandler = completionHandler;
</ins><span class="cx"> m_challenge = challenge;
</span><span class="cx"> m_client.canAuthenticateAgainstProtectionSpaceAsync(challenge.protectionSpace());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkLoad::didReceiveResponse(const ResourceResponse& response, std::function<void(WebCore::PolicyAction)> completionHandler)
</del><ins>+void NetworkLoad::didReceiveResponse(const ResourceResponse& response, ResponseCompletionHandler completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- sharedDidReceiveResponse(response);
- completionHandler(PolicyUse);
</del><ins>+ if (sharedDidReceiveResponse(response) == NetworkLoadClient::ShouldContinueDidReceiveResponse::Yes)
+ completionHandler(PolicyUse);
+ else
+ m_responseCompletionHandler = completionHandler;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkLoad::didReceiveData(RefPtr<SharedBuffer>&& buffer)
</span><span class="lines">@@ -204,6 +216,11 @@
</span><span class="cx"> m_client.didFailLoading(error);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkLoad::didBecomeDownload()
+{
+ m_client.didConvertToDownload();
+}
+
</ins><span class="cx"> #else
</span><span class="cx">
</span><span class="cx"> void NetworkLoad::didReceiveResponseAsync(ResourceHandle* handle, const ResourceResponse& receivedResponse)
</span><span class="lines">@@ -277,8 +294,8 @@
</span><span class="cx"> void NetworkLoad::continueCanAuthenticateAgainstProtectionSpace(bool result)
</span><span class="cx"> {
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- ASSERT(m_completionHandler);
- auto completionHandler = WTF::move(m_completionHandler);
</del><ins>+ ASSERT(m_challengeCompletionHandler);
+ auto completionHandler = WTF::move(m_challengeCompletionHandler);
</ins><span class="cx"> if (!result) {
</span><span class="cx"> completionHandler(AuthenticationChallengeDisposition::PerformDefaultHandling, Credential());
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (193786 => 193787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2015-12-08 23:02:58 UTC (rev 193786)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2015-12-08 23:05:52 UTC (rev 193787)
</span><span class="lines">@@ -59,12 +59,15 @@
</span><span class="cx"> void continueDidReceiveResponse();
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><ins>+ void convertTaskToDownload();
+
</ins><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="cx"> virtual void didReceiveChallenge(const WebCore::AuthenticationChallenge&, std::function<void(AuthenticationChallengeDisposition, const WebCore::Credential&)>) final override;
</span><span class="cx"> virtual void didReceiveResponse(const WebCore::ResourceResponse&, std::function<void(WebCore::PolicyAction)>) final override;
</span><span class="cx"> virtual void didReceiveData(RefPtr<WebCore::SharedBuffer>&&) final override;
</span><span class="cx"> virtual void didCompleteWithError(const WebCore::ResourceError&) final override;
</span><ins>+ virtual void didBecomeDownload() final override;
</ins><span class="cx"> #else
</span><span class="cx"> // ResourceHandleClient
</span><span class="cx"> virtual void willSendRequestAsync(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) override;
</span><span class="lines">@@ -117,7 +120,8 @@
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> Ref<NetworkDataTask> m_task;
</span><span class="cx"> WebCore::AuthenticationChallenge m_challenge;
</span><del>- ChallengeCompletionHandler m_completionHandler;
</del><ins>+ ChallengeCompletionHandler m_challengeCompletionHandler;
+ ResponseCompletionHandler m_responseCompletionHandler;
</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="trunkSourceWebKit2NetworkProcessNetworkLoadClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h (193786 => 193787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h 2015-12-08 23:02:58 UTC (rev 193786)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h 2015-12-08 23:05:52 UTC (rev 193787)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> virtual void didReceiveBuffer(RefPtr<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) = 0;
</span><span class="cx"> virtual void didFinishLoading(double finishTime) = 0;
</span><span class="cx"> virtual void didFailLoading(const WebCore::ResourceError&) = 0;
</span><ins>+ virtual void didConvertToDownload() = 0;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> virtual void willCacheResponseAsync(CFCachedURLResponseRef) = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (193786 => 193787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-12-08 23:02:58 UTC (rev 193786)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-12-08 23:05:52 UTC (rev 193787)
</span><span class="lines">@@ -198,23 +198,20 @@
</span><span class="cx"> m_connection->didCleanupResourceLoader(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !USE(NETWORK_SESSION)
-void NetworkResourceLoader::didConvertHandleToDownload()
</del><ins>+void NetworkResourceLoader::didConvertToDownload()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_networkLoad);
</span><del>- m_didConvertHandleToDownload = true;
-}
</del><ins>+ m_didConvertToDownload = true;
+#if USE(NETWORK_SESSION)
+ m_networkLoad = nullptr;
</ins><span class="cx"> #endif
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::abort()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><del>- if (m_networkLoad
-#if !USE(NETWORK_SESSION)
- && !m_didConvertHandleToDownload
-#endif
- ) {
</del><ins>+ if (m_networkLoad && !m_didConvertToDownload) {
</ins><span class="cx"> m_networkLoad->cancel();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (193786 => 193787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2015-12-08 23:02:58 UTC (rev 193786)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2015-12-08 23:05:52 UTC (rev 193787)
</span><span class="lines">@@ -61,10 +61,6 @@
</span><span class="cx">
</span><span class="cx"> NetworkLoad* networkLoad() const { return m_networkLoad.get(); }
</span><span class="cx">
</span><del>-#if !USE(NETWORK_SESSION)
- void didConvertHandleToDownload();
-#endif
-
</del><span class="cx"> void start();
</span><span class="cx"> void abort();
</span><span class="cx">
</span><span class="lines">@@ -106,6 +102,7 @@
</span><span class="cx"> virtual void didReceiveBuffer(RefPtr<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) override;
</span><span class="cx"> virtual void didFinishLoading(double finishTime) override;
</span><span class="cx"> virtual void didFailLoading(const WebCore::ResourceError&) override;
</span><ins>+ virtual void didConvertToDownload() override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NetworkResourceLoader(const NetworkResourceLoadParameters&, NetworkConnectionToWebProcess&, RefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>&&);
</span><span class="lines">@@ -150,9 +147,7 @@
</span><span class="cx"> std::unique_ptr<SynchronousLoadData> m_synchronousLoadData;
</span><span class="cx"> Vector<RefPtr<WebCore::BlobDataFileReference>> m_fileReferences;
</span><span class="cx">
</span><del>-#if !USE(NETWORK_SESSION)
- bool m_didConvertHandleToDownload { false };
-#endif
</del><ins>+ bool m_didConvertToDownload { false };
</ins><span class="cx"> bool m_didConsumeSandboxExtensions { false };
</span><span class="cx"> bool m_defersLoading { false };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkSession.h (193786 => 193787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2015-12-08 23:02:58 UTC (rev 193786)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2015-12-08 23:05:52 UTC (rev 193787)
</span><span class="lines">@@ -64,9 +64,11 @@
</span><span class="cx"> virtual void willPerformHTTPRedirection(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, std::function<void(const WebCore::ResourceRequest&)>) = 0;
</span><span class="cx"> typedef std::function<void(AuthenticationChallengeDisposition, const WebCore::Credential&)> ChallengeCompletionHandler;
</span><span class="cx"> virtual void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler) = 0;
</span><del>- virtual void didReceiveResponse(const WebCore::ResourceResponse&, std::function<void(WebCore::PolicyAction)>) = 0;
</del><ins>+ typedef std::function<void(WebCore::PolicyAction)> ResponseCompletionHandler;
+ virtual void didReceiveResponse(const WebCore::ResourceResponse&, ResponseCompletionHandler) = 0;
</ins><span class="cx"> virtual void didReceiveData(RefPtr<WebCore::SharedBuffer>&&) = 0;
</span><span class="cx"> virtual void didCompleteWithError(const WebCore::ResourceError&) = 0;
</span><ins>+ virtual void didBecomeDownload() = 0;
</ins><span class="cx">
</span><span class="cx"> virtual ~NetworkSessionTaskClient() { }
</span><span class="cx"> };
</span><span class="lines">@@ -103,7 +105,7 @@
</span><span class="cx"> Ephemeral
</span><span class="cx"> };
</span><span class="cx"> NetworkSession(Type, WebCore::SessionID);
</span><del>- ~NetworkSession() { ASSERT(m_dataTaskMap.isEmpty()); }
</del><ins>+ ~NetworkSession();
</ins><span class="cx">
</span><span class="cx"> static NetworkSession& defaultSession();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h (193786 => 193787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2015-12-08 23:02:58 UTC (rev 193786)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2015-12-08 23:05:52 UTC (rev 193787)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> virtual void didReceiveBuffer(RefPtr<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) override;
</span><span class="cx"> virtual void didFinishLoading(double finishTime) override;
</span><span class="cx"> virtual void didFailLoading(const WebCore::ResourceError&) override;
</span><ins>+ virtual void didConvertToDownload() override { ASSERT_NOT_REACHED(); }
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> virtual void willCacheResponseAsync(CFCachedURLResponseRef) override { }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (193786 => 193787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2015-12-08 23:02:58 UTC (rev 193786)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2015-12-08 23:05:52 UTC (rev 193787)
</span><span class="lines">@@ -170,6 +170,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite
</span><span class="cx"> {
</span><ins>+ ASSERT_WITH_MESSAGE(!_session->dataTaskForIdentifier([downloadTask taskIdentifier]), "The NetworkDataTask should be destroyed immediately after didBecomeDownloadTask returns");
</ins><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -180,7 +181,10 @@
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didBecomeDownloadTask:(NSURLSessionDownloadTask *)downloadTask
</span><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ auto* networkDataTask = _session->dataTaskForIdentifier([dataTask taskIdentifier]);
+ ASSERT(networkDataTask);
+ if (auto* client = networkDataTask->client())
+ client->didBecomeDownload();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -217,6 +221,11 @@
</span><span class="cx"> m_session = [NSURLSession sessionWithConfiguration:configuration delegate:static_cast<id>(m_sessionDelegate.get()) delegateQueue:[NSOperationQueue mainQueue]];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+NetworkSession::~NetworkSession()
+{
+ [m_session invalidateAndCancel];
+}
+
</ins><span class="cx"> Ref<NetworkDataTask> NetworkSession::createDataTaskWithRequest(const WebCore::ResourceRequest& request, NetworkSessionTaskClient& client)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new NetworkDataTask(*this, client, [m_session dataTaskWithRequest:request.nsURLRequest(WebCore::UpdateHTTPBody)]));
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/Download.h (193786 => 193787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/Download.h 2015-12-08 23:02:58 UTC (rev 193786)
+++ trunk/Source/WebKit2/Shared/Downloads/Download.h 2015-12-08 23:05:52 UTC (rev 193787)
</span><span class="lines">@@ -34,9 +34,13 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><ins>+#if USE(NETWORK_SESSION)
+OBJC_CLASS NSURLSessionDownloadTask;
+#else
</ins><span class="cx"> OBJC_CLASS NSURLDownload;
</span><span class="cx"> OBJC_CLASS WKDownloadAsDelegate;
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span><span class="cx"> #include <WebCore/ResourceHandle.h>
</span><span class="lines">@@ -124,7 +128,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- // FIXME: This needs member variables.
</del><ins>+ RetainPtr<NSURLSessionDownloadTask> m_download;
</ins><span class="cx"> #else
</span><span class="cx"> RetainPtr<NSURLDownload> m_nsURLDownload;
</span><span class="cx"> RetainPtr<WKDownloadAsDelegate> m_delegate;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsDownloadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h (193786 => 193787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h 2015-12-08 23:02:58 UTC (rev 193786)
+++ trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h 2015-12-08 23:05:52 UTC (rev 193787)
</span><span class="lines">@@ -33,7 +33,9 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+#if !USE(NETWORK_SESSION)
</ins><span class="cx"> class ResourceHandle;
</span><ins>+#endif
</ins><span class="cx"> class ResourceRequest;
</span><span class="cx"> class ResourceResponse;
</span><span class="cx"> class SessionID;
</span><span class="lines">@@ -77,13 +79,8 @@
</span><span class="cx"> void cancelDownload(uint64_t downloadID);
</span><span class="cx">
</span><span class="cx"> void downloadFinished(Download*);
</span><del>-#if USE(NETWORK_SESSION)
- bool isDownloading() const { notImplemented(); return false; }
- uint64_t activeDownloadCount() const { notImplemented(); return 0; }
-#else
</del><span class="cx"> bool isDownloading() const { return !m_downloads.isEmpty(); }
</span><span class="cx"> uint64_t activeDownloadCount() const { return m_downloads.size(); }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void didCreateDownload();
</span><span class="cx"> void didDestroyDownload();
</span><span class="lines">@@ -93,9 +90,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Client* m_client;
</span><del>-#if !USE(NETWORK_SESSION)
</del><span class="cx"> HashMap<uint64_t, std::unique_ptr<Download>> m_downloads;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>