<!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>[194718] 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/194718">194718</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-01-07 13:28:42 -0800 (Thu, 07 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards implementing downloads with NetworkSession
https://bugs.webkit.org/show_bug.cgi?id=152760
Reviewed by Brady Eidson.
* NetworkProcess/Downloads/Download.cpp:
(WebKit::Download::Download):
There's no need to store the unused NetworkSession&.
(WebKit::Download::didStart):
(WebKit::Download::didReceiveAuthenticationChallenge):
Downloads with NetworkSession are NetworkLoads until the response is received, which is after authentication
challenges are handled by NetworkLoad's code.
(WebKit::Download::didReceiveResponse):
* NetworkProcess/Downloads/Download.h:
* NetworkProcess/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::startDownload):
Create a PendingDownload, which is basically a NetworkLoad that knows that it will become a Download
when the response is received, regardless of whether or not there is a Content-Disposition header.
(WebKit::DownloadManager::dataTaskBecameDownloadTask):
* NetworkProcess/Downloads/DownloadManager.h:
* NetworkProcess/Downloads/PendingDownload.h: Added.
(WebKit::PendingDownload::PendingDownload):
Added a new NetworkLoadClient for requests that will become downloads.
A PendingDownload contains a NetworkLoad so we can always keep them together
and so it can handle setting its pending download id.
* WebKit2.xcodeproj/project.pbxproj:
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::NetworkLoad):
Avoid dereferencing a pointer if the NetworkSession hadn't been created when a NetworkLoad starts.
This shouldn't be possible, but it's good to not assume that all pointers are non-null.
(WebKit::NetworkLoad::cancel):
Add a null check in case the constructor doesn't make m_task.
(WebKit::NetworkLoad::convertTaskToDownload):
(WebKit::NetworkLoad::setPendingDownloadID):
Added for downloads that start with startDownload. The pending DownloadID is used to indicate that
this request should always become a download, regardless of whether or not the response has a
Content-Disposition header.
(WebKit::NetworkLoad::willPerformHTTPRedirection):
(WebKit::NetworkLoad::didReceiveResponse):
* NetworkProcess/NetworkLoad.h:
There's no need to store a DownloadID here. It's stored in the NetworkDataTask (m_task).
* NetworkProcess/NetworkSession.h:
(WebKit::NetworkDataTask::client):
(WebKit::NetworkDataTask::pendingDownloadID):
(WebKit::NetworkDataTask::setPendingDownloadID):
(WebKit::NetworkDataTask::downloadID): Deleted.
(WebKit::NetworkDataTask::setDownloadID): Deleted.
Renamed downloadID and setDownloadID to pendingDownloadID and setPendingDownloadID, respectively,
to indicate their use. They are not the current downloadID, but they are the downloadID of the download
that will happen once the response is received and PolicyDownload will be returned in the completion handler.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):
Call dataTaskBecameDownloadTask after didBecomeDownload because the networkDataTask is deleted by removing it
from m_pendingDownloads in dataTaskBecameDownloadTask.</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="#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>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadh">trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194717 => 194718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-07 21:27:48 UTC (rev 194717)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-07 21:28:42 UTC (rev 194718)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2016-01-07 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards implementing downloads with NetworkSession
+ https://bugs.webkit.org/show_bug.cgi?id=152760
+
+ Reviewed by Brady Eidson.
+
+ * NetworkProcess/Downloads/Download.cpp:
+ (WebKit::Download::Download):
+ There's no need to store the unused NetworkSession&.
+ (WebKit::Download::didStart):
+ (WebKit::Download::didReceiveAuthenticationChallenge):
+ Downloads with NetworkSession are NetworkLoads until the response is received, which is after authentication
+ challenges are handled by NetworkLoad's code.
+ (WebKit::Download::didReceiveResponse):
+ * NetworkProcess/Downloads/Download.h:
+ * NetworkProcess/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::startDownload):
+ Create a PendingDownload, which is basically a NetworkLoad that knows that it will become a Download
+ when the response is received, regardless of whether or not there is a Content-Disposition header.
+ (WebKit::DownloadManager::dataTaskBecameDownloadTask):
+ * NetworkProcess/Downloads/DownloadManager.h:
+ * NetworkProcess/Downloads/PendingDownload.h: Added.
+ (WebKit::PendingDownload::PendingDownload):
+ Added a new NetworkLoadClient for requests that will become downloads.
+ A PendingDownload contains a NetworkLoad so we can always keep them together
+ and so it can handle setting its pending download id.
+ * WebKit2.xcodeproj/project.pbxproj:
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::NetworkLoad):
+ Avoid dereferencing a pointer if the NetworkSession hadn't been created when a NetworkLoad starts.
+ This shouldn't be possible, but it's good to not assume that all pointers are non-null.
+ (WebKit::NetworkLoad::cancel):
+ Add a null check in case the constructor doesn't make m_task.
+ (WebKit::NetworkLoad::convertTaskToDownload):
+ (WebKit::NetworkLoad::setPendingDownloadID):
+ Added for downloads that start with startDownload. The pending DownloadID is used to indicate that
+ this request should always become a download, regardless of whether or not the response has a
+ Content-Disposition header.
+ (WebKit::NetworkLoad::willPerformHTTPRedirection):
+ (WebKit::NetworkLoad::didReceiveResponse):
+ * NetworkProcess/NetworkLoad.h:
+ There's no need to store a DownloadID here. It's stored in the NetworkDataTask (m_task).
+ * NetworkProcess/NetworkSession.h:
+ (WebKit::NetworkDataTask::client):
+ (WebKit::NetworkDataTask::pendingDownloadID):
+ (WebKit::NetworkDataTask::setPendingDownloadID):
+ (WebKit::NetworkDataTask::downloadID): Deleted.
+ (WebKit::NetworkDataTask::setDownloadID): Deleted.
+ Renamed downloadID and setDownloadID to pendingDownloadID and setPendingDownloadID, respectively,
+ to indicate their use. They are not the current downloadID, but they are the downloadID of the download
+ that will happen once the response is received and PolicyDownload will be returned in the completion handler.
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):
+ Call dataTaskBecameDownloadTask after didBecomeDownload because the networkDataTask is deleted by removing it
+ from m_pendingDownloads in dataTaskBecameDownloadTask.
+
</ins><span class="cx"> 2016-01-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a setting and preferences to enable display-list drawing. Does nothing yet.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (194717 => 194718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-01-07 21:27:48 UTC (rev 194717)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-01-07 21:28:42 UTC (rev 194718)
</span><span class="lines">@@ -44,15 +44,13 @@
</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)
</del><ins>+Download::Download(DownloadManager& downloadManager, 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>-#if USE(NETWORK_SESSION)
- , m_session(session)
-#else
</del><ins>+#if !USE(NETWORK_SESSION)
</ins><span class="cx"> , m_request(request)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -80,14 +78,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !USE(NETWORK_SESSION)
</ins><span class="cx"> void Download::didReceiveAuthenticationChallenge(const AuthenticationChallenge& authenticationChallenge)
</span><span class="cx"> {
</span><del>-#if USE(NETWORK_SESSION)
- notImplemented();
-#else
</del><span class="cx"> m_downloadManager.downloadsAuthenticationManager().didReceiveAuthenticationChallenge(*this, authenticationChallenge);
</span><del>-#endif
</del><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void Download::didReceiveResponse(const ResourceResponse& response)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h (194717 => 194718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-01-07 21:27:48 UTC (rev 194717)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-01-07 21:28:42 UTC (rev 194718)
</span><span class="lines">@@ -76,7 +76,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);
</del><ins>+ Download(DownloadManager&, 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">@@ -97,8 +97,8 @@
</span><span class="cx"> void didStart(const WebCore::ResourceRequest&);
</span><span class="cx"> #else
</span><span class="cx"> void didStart();
</span><del>-#endif
</del><span class="cx"> void didReceiveAuthenticationChallenge(const WebCore::AuthenticationChallenge&);
</span><ins>+#endif
</ins><span class="cx"> void didReceiveResponse(const WebCore::ResourceResponse&);
</span><span class="cx"> void didReceiveData(uint64_t length);
</span><span class="cx"> bool shouldDecodeSourceDataOfMIMEType(const String& mimeType);
</span><span class="lines">@@ -141,7 +141,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- const NetworkSession& m_session;
</del><span class="cx"> RetainPtr<NSURLSessionDownloadTask> m_download;
</span><span class="cx"> #else
</span><span class="cx"> RetainPtr<NSURLDownload> m_nsURLDownload;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (194717 => 194718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-01-07 21:27:48 UTC (rev 194717)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-01-07 21:28:42 UTC (rev 194718)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> #include "DownloadManager.h"
</span><span class="cx">
</span><span class="cx"> #include "Download.h"
</span><ins>+#include "NetworkSession.h"
+#include "PendingDownload.h"
</ins><span class="cx"> #include "SessionTracker.h"
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="lines">@@ -47,21 +49,27 @@
</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);
- download->didStart(request);
</del><ins>+ NetworkLoadParameters parameters;
+ parameters.sessionID = sessionID;
+ parameters.request = request;
+ m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(parameters, downloadID));
</ins><span class="cx"> #else
</span><span class="cx"> auto download = std::make_unique<Download>(*this, downloadID, request);
</span><span class="cx"> download->start();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> ASSERT(!m_downloads.contains(downloadID));
</span><span class="cx"> m_downloads.add(downloadID, WTFMove(download));
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>-void DownloadManager::dataTaskBecameDownloadTask(DownloadID downloadID, std::unique_ptr<Download>&& download)
</del><ins>+std::unique_ptr<PendingDownload> DownloadManager::dataTaskBecameDownloadTask(DownloadID downloadID, std::unique_ptr<Download>&& download)
</ins><span class="cx"> {
</span><ins>+ // This is needed for downloads started with startDownload, otherwise it will return nullptr.
+ auto pendingDownload = m_pendingDownloads.take(downloadID);
+
</ins><span class="cx"> m_downloads.add(downloadID, WTFMove(download));
</span><ins>+ return pendingDownload;
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> void DownloadManager::convertHandleToDownload(DownloadID downloadID, ResourceHandle* handle, const ResourceRequest& request, const ResourceResponse& response)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (194717 => 194718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-01-07 21:27:48 UTC (rev 194717)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-01-07 21:28:42 UTC (rev 194718)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define DownloadManager_h
</span><span class="cx">
</span><span class="cx"> #include "DownloadID.h"
</span><ins>+#include "PendingDownload.h"
</ins><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -51,6 +52,7 @@
</span><span class="cx">
</span><span class="cx"> class AuthenticationManager;
</span><span class="cx"> class Download;
</span><ins>+class PendingDownload;
</ins><span class="cx">
</span><span class="cx"> class DownloadManager {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(DownloadManager);
</span><span class="lines">@@ -70,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> void startDownload(WebCore::SessionID, DownloadID, const WebCore::ResourceRequest&);
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- void dataTaskBecameDownloadTask(DownloadID, std::unique_ptr<Download>&&);
</del><ins>+ std::unique_ptr<PendingDownload> dataTaskBecameDownloadTask(DownloadID, std::unique_ptr<Download>&&);
</ins><span class="cx"> #else
</span><span class="cx"> void convertHandleToDownload(DownloadID, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</span><span class="cx"> #endif
</span><span class="lines">@@ -93,6 +95,9 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Client& m_client;
</span><ins>+#if USE(NETWORK_SESSION)
+ HashMap<DownloadID, std::unique_ptr<PendingDownload>> m_pendingDownloads;
+#endif
</ins><span class="cx"> HashMap<DownloadID, std::unique_ptr<Download>> m_downloads;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h (0 => 194718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h 2016-01-07 21:28:42 UTC (rev 194718)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef PendingDownload_h
+#define PendingDownload_h
+
+#if USE(NETWORK_SESSION)
+
+#include "NetworkLoad.h"
+
+namespace WebKit {
+
+class PendingDownload : public NetworkLoadClient {
+public:
+ PendingDownload(const NetworkLoadParameters& parameters, DownloadID downloadID)
+ : m_networkLoad(std::make_unique<NetworkLoad>(*this, parameters))
+ {
+ m_networkLoad->setPendingDownloadID(downloadID);
+ }
+
+private:
+ // NetworkLoadClient.
+ virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override { }
+ virtual void canAuthenticateAgainstProtectionSpaceAsync(const WebCore::ProtectionSpace&) override { }
+ virtual bool isSynchronous() const override { return false; }
+ virtual void willSendRedirectedRequest(const WebCore::ResourceRequest&, const WebCore::ResourceRequest& redirectRequest, const WebCore::ResourceResponse& redirectResponse) override
+ {
+ // FIXME: We should ask the UI process directly if we actually want to continue this request.
+ m_networkLoad->continueWillSendRequest(redirectRequest);
+ };
+ virtual ShouldContinueDidReceiveResponse didReceiveResponse(const WebCore::ResourceResponse&) override { return ShouldContinueDidReceiveResponse::No; };
+ virtual void didReceiveBuffer(RefPtr<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) override { };
+ virtual void didFinishLoading(double finishTime) override { };
+ virtual void didFailLoading(const WebCore::ResourceError&) override { };
+ virtual void didConvertToDownload() override { m_networkLoad = nullptr; }
+#if PLATFORM(COCOA)
+ virtual void willCacheResponseAsync(CFCachedURLResponseRef) override { }
+#endif
+private:
+ std::unique_ptr<NetworkLoad> m_networkLoad;
+};
+
+}
+
+#endif
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (194717 => 194718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-01-07 21:27:48 UTC (rev 194717)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-01-07 21:28:42 UTC (rev 194718)
</span><span class="lines">@@ -47,14 +47,16 @@
</span><span class="cx"> : m_client(client)
</span><span class="cx"> , m_parameters(parameters)
</span><span class="cx"> , m_networkingContext(RemoteNetworkingContext::create(parameters.sessionID, parameters.shouldClearReferrerOnHTTPSToHTTPRedirect))
</span><del>-#if USE(NETWORK_SESSION)
- , m_task(SessionTracker::networkSession(parameters.sessionID)->createDataTaskWithRequest(parameters.request, *this))
-#endif
</del><span class="cx"> , m_currentRequest(parameters.request)
</span><span class="cx"> {
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- if (!parameters.defersLoading)
- m_task->resume();
</del><ins>+ if (!parameters.defersLoading) {
+ if (auto* networkSession = SessionTracker::networkSession(parameters.sessionID)) {
+ m_task = networkSession->createDataTaskWithRequest(parameters.request, *this);
+ m_task->resume();
+ } else
+ ASSERT_NOT_REACHED();
+ }
</ins><span class="cx"> #else
</span><span class="cx"> m_handle = ResourceHandle::create(m_networkingContext.get(), parameters.request, this, parameters.defersLoading, parameters.contentSniffingPolicy == SniffContent);
</span><span class="cx"> #endif
</span><span class="lines">@@ -88,7 +90,8 @@
</span><span class="cx"> void NetworkLoad::cancel()
</span><span class="cx"> {
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- m_task->cancel();
</del><ins>+ if (m_task)
+ m_task->cancel();
</ins><span class="cx"> #else
</span><span class="cx"> if (m_handle)
</span><span class="cx"> m_handle->cancel();
</span><span class="lines">@@ -160,13 +163,18 @@
</span><span class="cx">
</span><span class="cx"> void NetworkLoad::convertTaskToDownload(DownloadID downloadID)
</span><span class="cx"> {
</span><del>- m_task->setDownloadID(downloadID);
</del><ins>+ m_task->setPendingDownloadID(downloadID);
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_responseCompletionHandler);
</span><span class="cx"> m_responseCompletionHandler(PolicyDownload);
</span><span class="cx"> m_responseCompletionHandler = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkLoad::setPendingDownloadID(DownloadID downloadID)
+{
+ m_task->setPendingDownloadID(downloadID);
+}
+
</ins><span class="cx"> void NetworkLoad::willPerformHTTPRedirection(const ResourceResponse& response, const ResourceRequest& request, RedirectCompletionHandler completionHandler)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_redirectCompletionHandler);
</span><span class="lines">@@ -202,7 +210,9 @@
</span><span class="cx"> void NetworkLoad::didReceiveResponse(const ResourceResponse& response, ResponseCompletionHandler completionHandler)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- if (sharedDidReceiveResponse(response) == NetworkLoadClient::ShouldContinueDidReceiveResponse::Yes)
</del><ins>+ if (m_task && m_task->pendingDownloadID().downloadID())
+ completionHandler(PolicyDownload);
+ else if (sharedDidReceiveResponse(response) == NetworkLoadClient::ShouldContinueDidReceiveResponse::Yes)
</ins><span class="cx"> completionHandler(PolicyUse);
</span><span class="cx"> else
</span><span class="cx"> m_responseCompletionHandler = completionHandler;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (194717 => 194718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-01-07 21:27:48 UTC (rev 194717)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-01-07 21:28:42 UTC (rev 194718)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> void convertTaskToDownload(DownloadID);
</span><ins>+ void setPendingDownloadID(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">@@ -125,7 +126,6 @@
</span><span class="cx"> ChallengeCompletionHandler m_challengeCompletionHandler;
</span><span class="cx"> ResponseCompletionHandler m_responseCompletionHandler;
</span><span class="cx"> RedirectCompletionHandler m_redirectCompletionHandler;
</span><del>- DownloadID m_downloadID;
</del><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 (194717 => 194718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2016-01-07 21:27:48 UTC (rev 194717)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2016-01-07 21:28:42 UTC (rev 194718)
</span><span class="lines">@@ -97,18 +97,18 @@
</span><span class="cx">
</span><span class="cx"> NetworkSessionTaskClient& client() { return m_client; }
</span><span class="cx">
</span><del>- DownloadID downloadID() { return m_downloadID; }
- void setDownloadID(DownloadID downloadID)
</del><ins>+ DownloadID pendingDownloadID() { return m_pendingDownloadID; }
+ void setPendingDownloadID(DownloadID downloadID)
</ins><span class="cx"> {
</span><del>- ASSERT(!m_downloadID.downloadID());
</del><ins>+ ASSERT(!m_pendingDownloadID.downloadID());
</ins><span class="cx"> ASSERT(downloadID.downloadID());
</span><del>- m_downloadID = downloadID;
</del><ins>+ m_pendingDownloadID = downloadID;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NetworkSession& m_session;
</span><span class="cx"> NetworkSessionTaskClient& m_client;
</span><del>- DownloadID m_downloadID;
</del><ins>+ DownloadID m_pendingDownloadID;
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> RetainPtr<NSURLSessionDataTask> m_task;
</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 (194717 => 194718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-01-07 21:27:48 UTC (rev 194717)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-01-07 21:28:42 UTC (rev 194718)
</span><span class="lines">@@ -166,12 +166,12 @@
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didBecomeDownloadTask:(NSURLSessionDownloadTask *)downloadTask
</span><span class="cx"> {
</span><span class="cx"> if (auto* networkDataTask = _session->dataTaskForIdentifier([dataTask taskIdentifier])) {
</span><del>- auto downloadID = networkDataTask->downloadID();
</del><ins>+ auto downloadID = networkDataTask->pendingDownloadID();
</ins><span class="cx"> auto& downloadManager = WebKit::NetworkProcess::singleton().downloadManager();
</span><del>- auto download = std::make_unique<WebKit::Download>(downloadManager, *_session, downloadID);
</del><ins>+ auto download = std::make_unique<WebKit::Download>(downloadManager, downloadID);
</ins><span class="cx"> download->didStart([downloadTask currentRequest]);
</span><span class="cx"> download->didReceiveResponse([downloadTask response]);
</span><del>- downloadManager.dataTaskBecameDownloadTask(downloadID, WTFMove(download));
</del><ins>+ auto pendingDownload = downloadManager.dataTaskBecameDownloadTask(downloadID, WTFMove(download));
</ins><span class="cx">
</span><span class="cx"> networkDataTask->client().didBecomeDownload();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (194717 => 194718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-01-07 21:27:48 UTC (rev 194717)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-01-07 21:28:42 UTC (rev 194718)
</span><span class="lines">@@ -1068,6 +1068,7 @@
</span><span class="cx"> 5C14271D1C23F8CF00D41183 /* CustomProtocolManagerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C14271B1C23F8CC00D41183 /* CustomProtocolManagerCocoa.mm */; };
</span><span class="cx"> 5C20CB9D1BB0DCFA00895BB1 /* NetworkSessionCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C20CB9B1BB0DCD200895BB1 /* NetworkSessionCocoa.mm */; };
</span><span class="cx"> 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */; };
</span><ins>+ 5C298DA01C3DF02100470AFE /* PendingDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C298D9E1C3DEF2900470AFE /* PendingDownload.h */; };
</ins><span class="cx"> 5DA6ED0A1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DA6ED081490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h */; };
</span><span class="cx"> 5DA6ED0B1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5DA6ED091490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm */; };
</span><span class="cx"> 6501BD1A12F1243400E9F248 /* WKBundleInspector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65B86F1712F11D7B00B7DD8A /* WKBundleInspector.cpp */; };
</span><span class="lines">@@ -3252,6 +3253,7 @@
</span><span class="cx"> 5C14271B1C23F8CC00D41183 /* CustomProtocolManagerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CustomProtocolManagerCocoa.mm; path = NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx"> 5C20CB9B1BB0DCD200895BB1 /* NetworkSessionCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkSessionCocoa.mm; path = NetworkProcess/cocoa/NetworkSessionCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx"> 5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkSession.h; path = NetworkProcess/NetworkSession.h; sourceTree = "<group>"; };
</span><ins>+ 5C298D9E1C3DEF2900470AFE /* PendingDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PendingDownload.h; path = NetworkProcess/Downloads/PendingDownload.h; sourceTree = "<group>"; };
</ins><span class="cx"> 5D442A5516D5856700AC3331 /* PluginService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PluginService.entitlements; sourceTree = "<group>"; };
</span><span class="cx"> 5DA6ED081490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLinkerEnvironmentExtractor.h; sourceTree = "<group>"; };
</span><span class="cx"> 5DA6ED091490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DynamicLinkerEnvironmentExtractor.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -5826,6 +5828,7 @@
</span><span class="cx"> 5C1426F11C23F81700D41183 /* Downloads */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 5C298D9E1C3DEF2900470AFE /* PendingDownload.h */,
</ins><span class="cx"> 5C14270C1C23F87700D41183 /* ios */,
</span><span class="cx"> 5C14270B1C23F87100D41183 /* mac */,
</span><span class="cx"> 5C1427081C23F85200D41183 /* cocoa */,
</span><span class="lines">@@ -8305,6 +8308,7 @@
</span><span class="cx"> 1ABC3DFC1899F51C004F0626 /* WKNavigationDelegate.h in Headers */,
</span><span class="cx"> 1AA20D5118AD50E0005D1ED4 /* WKNavigationDelegatePrivate.h in Headers */,
</span><span class="cx"> 1ABC3DF11899C6B6004F0626 /* WKNavigationInternal.h in Headers */,
</span><ins>+ 5C298DA01C3DF02100470AFE /* PendingDownload.h in Headers */,
</ins><span class="cx"> 1ACC87BA1981C341003D1AF4 /* WKNavigationPrivate.h in Headers */,
</span><span class="cx"> 2D3A65E31A7C3A9300CAC637 /* WKNavigationRef.h in Headers */,
</span><span class="cx"> 1A1B0EB618A424950038481A /* WKNavigationResponse.h in Headers */,
</span></span></pre>
</div>
</div>
</body>
</html>