<!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>[174987] 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/174987">174987</a></dd>
<dt>Author</dt> <dd>jeffm@apple.com</dd>
<dt>Date</dt> <dd>2014-10-21 10:46:11 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKContext needs to provide an API to resume a download
https://bugs.webkit.org/show_bug.cgi?id=137507
Reviewed by Darin Adler.
This patch adds WKContextResumeDownload(), which is only supported on the Mac, and requires the
resume data from WKDownloadGetResumeData().
We have to create a sandbox extension for the partially downloaded file in the UI process so the
network or web process can resume writing to it.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::resumeDownload):
Added, calls through to DownloadManager::resumeDownload().
* NetworkProcess/NetworkProcess.h:
Added resumeDownload().
* NetworkProcess/NetworkProcess.messages.in:
Added ResumeDownload message.
* Shared/Downloads/Download.h:
Added resume().
* Shared/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::resumeDownload):
Added. The URL being downloaded is part of the opaque resumeData, so we can't specify it when the
Download is constructed.
* Shared/Downloads/DownloadManager.h:
Added resumeDownload().
* Shared/Downloads/ios/DownloadIOS.mm:
(WebKit::Download::resume):
Added, not implemented on this platform.
* Shared/Downloads/mac/DownloadMac.mm:
(WebKit::Download::resume):
Added. Consumes the sandbox extension, resumes the download, and sets m_request after the
NSURLDownload has been created. Note that we already have code to revoke the sandbox extension when
the download is finished, canceled, or fails.
* Shared/Downloads/soup/DownloadSoup.cpp:
(WebKit::Download::resume):
Added, not implemented on this platform.
* UIProcess/API/C/WKContext.cpp:
(WKContextResumeDownload):
Added.
* UIProcess/API/C/WKContext.h:
Added WKContextResumeDownload().
* UIProcess/WebContext.cpp:
(WebKit::WebContext::resumeDownload):
Added. Creates a sandbox extension for the existing file and includes it in the message to the
network or web process.
* UIProcess/WebContext.h:
Added resumeDownload().
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::resumeDownload):
Added, calls through to DownloadManager::resumeDownload().
* WebProcess/WebProcess.h:
Added resumeDownload().
* WebProcess/WebProcess.messages.in:
Added ResumeDownload message.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadsDownloadh">trunk/Source/WebKit2/Shared/Downloads/Download.h</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadsDownloadManagercpp">trunk/Source/WebKit2/Shared/Downloads/DownloadManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadsDownloadManagerh">trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadsiosDownloadIOSmm">trunk/Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadsmacDownloadMacmm">trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadssoupDownloadSoupcpp">trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContexth">trunk/Source/WebKit2/UIProcess/API/C/WKContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -1,3 +1,76 @@
</span><ins>+2014-10-21 Jeff Miller <jeffm@apple.com>
+
+ WKContext needs to provide an API to resume a download
+ https://bugs.webkit.org/show_bug.cgi?id=137507
+
+ Reviewed by Darin Adler.
+
+ This patch adds WKContextResumeDownload(), which is only supported on the Mac, and requires the
+ resume data from WKDownloadGetResumeData().
+
+ We have to create a sandbox extension for the partially downloaded file in the UI process so the
+ network or web process can resume writing to it.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::resumeDownload):
+ Added, calls through to DownloadManager::resumeDownload().
+
+ * NetworkProcess/NetworkProcess.h:
+ Added resumeDownload().
+
+ * NetworkProcess/NetworkProcess.messages.in:
+ Added ResumeDownload message.
+
+ * Shared/Downloads/Download.h:
+ Added resume().
+
+ * Shared/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::resumeDownload):
+ Added. The URL being downloaded is part of the opaque resumeData, so we can't specify it when the
+ Download is constructed.
+
+ * Shared/Downloads/DownloadManager.h:
+ Added resumeDownload().
+
+ * Shared/Downloads/ios/DownloadIOS.mm:
+ (WebKit::Download::resume):
+ Added, not implemented on this platform.
+
+ * Shared/Downloads/mac/DownloadMac.mm:
+ (WebKit::Download::resume):
+ Added. Consumes the sandbox extension, resumes the download, and sets m_request after the
+ NSURLDownload has been created. Note that we already have code to revoke the sandbox extension when
+ the download is finished, canceled, or fails.
+
+ * Shared/Downloads/soup/DownloadSoup.cpp:
+ (WebKit::Download::resume):
+ Added, not implemented on this platform.
+
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextResumeDownload):
+ Added.
+
+ * UIProcess/API/C/WKContext.h:
+ Added WKContextResumeDownload().
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::resumeDownload):
+ Added. Creates a sandbox extension for the existing file and includes it in the message to the
+ network or web process.
+
+ * UIProcess/WebContext.h:
+ Added resumeDownload().
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::resumeDownload):
+ Added, calls through to DownloadManager::resumeDownload().
+
+ * WebProcess/WebProcess.h:
+ Added resumeDownload().
+
+ * WebProcess/WebProcess.messages.in:
+ Added ResumeDownload message.
+
</ins><span class="cx"> 2014-10-20 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Change the default TLS errors policy to WEBKIT_TLS_ERRORS_POLICY_FAIL
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -236,6 +236,11 @@
</span><span class="cx"> downloadManager().startDownload(downloadID, request);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkProcess::resumeDownload(uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const WebKit::SandboxExtension::Handle& sandboxExtensionHandle)
+{
+ downloadManager().resumeDownload(downloadID, resumeData, path, sandboxExtensionHandle);
+}
+
</ins><span class="cx"> void NetworkProcess::cancelDownload(uint64_t downloadID)
</span><span class="cx"> {
</span><span class="cx"> downloadManager().cancelDownload(downloadID);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -113,6 +113,7 @@
</span><span class="cx"> void ensurePrivateBrowsingSession(WebCore::SessionID);
</span><span class="cx"> void destroyPrivateBrowsingSession(WebCore::SessionID);
</span><span class="cx"> void downloadRequest(uint64_t downloadID, const WebCore::ResourceRequest&);
</span><ins>+ void resumeDownload(uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
</ins><span class="cx"> void cancelDownload(uint64_t downloadID);
</span><span class="cx"> void setCacheModel(uint32_t);
</span><span class="cx"> void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> DestroyPrivateBrowsingSession(WebCore::SessionID sessionID)
</span><span class="cx">
</span><span class="cx"> DownloadRequest(uint64_t downloadID, WebCore::ResourceRequest request)
</span><ins>+ ResumeDownload(uint64_t downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
</ins><span class="cx"> CancelDownload(uint64_t downloadID)
</span><span class="cx">
</span><span class="cx"> SetProcessSuppressionEnabled(bool flag)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/Download.h (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/Download.h 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/Shared/Downloads/Download.h 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define Download_h
</span><span class="cx">
</span><span class="cx"> #include "MessageSender.h"
</span><ins>+#include "SandboxExtension.h"
</ins><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="lines">@@ -63,7 +64,6 @@
</span><span class="cx">
</span><span class="cx"> class DownloadAuthenticationClient;
</span><span class="cx"> class DownloadManager;
</span><del>-class SandboxExtension;
</del><span class="cx"> class WebPage;
</span><span class="cx">
</span><span class="cx"> class Download : public IPC::MessageSender {
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx">
</span><span class="cx"> void start();
</span><span class="cx"> void startWithHandle(WebCore::ResourceHandle*, const WebCore::ResourceResponse&);
</span><ins>+ void resume(const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
</ins><span class="cx"> void cancel();
</span><span class="cx">
</span><span class="cx"> uint64_t downloadID() const { return m_downloadID; }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsDownloadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/DownloadManager.cpp (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/DownloadManager.cpp 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/Shared/Downloads/DownloadManager.cpp 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -56,6 +56,16 @@
</span><span class="cx"> m_downloads.add(downloadID, WTF::move(download));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DownloadManager::resumeDownload(uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle& sandboxExtensionHandle)
+{
+ // Download::resume() is responsible for setting the Download's resource request.
+ auto download = std::make_unique<Download>(*this, downloadID, ResourceRequest());
+
+ download->resume(resumeData, path, sandboxExtensionHandle);
+ ASSERT(!m_downloads.contains(downloadID));
+ m_downloads.add(downloadID, WTF::move(download));
+}
+
</ins><span class="cx"> void DownloadManager::cancelDownload(uint64_t downloadID)
</span><span class="cx"> {
</span><span class="cx"> Download* download = m_downloads.get(downloadID);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsDownloadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef DownloadManager_h
</span><span class="cx"> #define DownloadManager_h
</span><span class="cx">
</span><ins>+#include "SandboxExtension.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="lines">@@ -38,6 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx"> class Connection;
</span><ins>+class DataReference;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -65,6 +67,8 @@
</span><span class="cx"> void startDownload(uint64_t downloadID, const WebCore::ResourceRequest&);
</span><span class="cx"> void convertHandleToDownload(uint64_t downloadID, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</span><span class="cx">
</span><ins>+ void resumeDownload(uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
+
</ins><span class="cx"> void cancelDownload(uint64_t downloadID);
</span><span class="cx">
</span><span class="cx"> void downloadFinished(Download*);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsiosDownloadIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -127,6 +127,11 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Download::resume(const IPC::DataReference&, const String&, const SandboxExtension::Handle&)
+{
+ notImplemented();
+}
+
</ins><span class="cx"> void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: For some reason the filename needs to be accessed or it may be incorrect after
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsmacDownloadMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -88,6 +88,26 @@
</span><span class="cx"> [m_nsURLDownload setDeletesFileUponFailure:NO];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Download::resume(const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle& sandboxExtensionHandle)
+{
+ ASSERT(!m_nsURLDownload);
+ ASSERT(!m_delegate);
+
+ m_sandboxExtension = SandboxExtension::create(sandboxExtensionHandle);
+ if (m_sandboxExtension)
+ m_sandboxExtension->consume();
+
+ m_delegate = adoptNS([[WKDownloadAsDelegate alloc] initWithDownload:this]);
+
+ auto nsData = adoptNS([[NSData alloc] initWithBytes:resumeData.data() length:resumeData.size()]);
+ m_nsURLDownload = adoptNS([[NSURLDownload alloc] initWithResumeData:nsData.get() delegate:m_delegate.get() path:path]);
+
+ m_request = [m_nsURLDownload request];
+
+ // FIXME: Allow this to be changed by the client.
+ [m_nsURLDownload setDeletesFileUponFailure:NO];
+}
+
</ins><span class="cx"> void Download::cancel()
</span><span class="cx"> {
</span><span class="cx"> [m_nsURLDownload cancel];
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadssoupDownloadSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -236,6 +236,11 @@
</span><span class="cx"> static_cast<DownloadClient*>(m_downloadClient.get())->handleResponseLater(response);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Download::resume(const IPC::DataReference&, const String&, const SandboxExtension::Handle&)
+{
+ notImplemented();
+}
+
</ins><span class="cx"> void Download::cancel()
</span><span class="cx"> {
</span><span class="cx"> if (!m_resourceHandle)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -282,6 +282,11 @@
</span><span class="cx"> return toAPI(toImpl(contextRef)->download(0, toImpl(requestRef)->resourceRequest()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WKDownloadRef WKContextResumeDownload(WKContextRef contextRef, WKDataRef resumeData, WKStringRef path)
+{
+ return toAPI(toImpl(contextRef)->resumeDownload(toImpl(resumeData), toWTFString(path)));
+}
+
</ins><span class="cx"> void WKContextSetInitializationUserDataForInjectedBundle(WKContextRef contextRef, WKTypeRef userDataRef)
</span><span class="cx"> {
</span><span class="cx"> toImpl(contextRef)->setInjectedBundleInitializationUserData(toImpl(userDataRef));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -111,6 +111,7 @@
</span><span class="cx"> WK_EXPORT void WKContextSetConnectionClient(WKContextRef context, const WKContextConnectionClientBase* client);
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKDownloadRef WKContextDownloadURLRequest(WKContextRef context, const WKURLRequestRef request);
</span><ins>+WK_EXPORT WKDownloadRef WKContextResumeDownload(WKContextRef context, WKDataRef resumeData, WKStringRef path);
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT void WKContextSetInitializationUserDataForInjectedBundle(WKContextRef context, WKTypeRef userData);
</span><span class="cx"> WK_EXPORT void WKContextPostMessageToInjectedBundle(WKContextRef context, WKStringRef messageName, WKTypeRef messageBody);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -889,6 +889,25 @@
</span><span class="cx"> return downloadProxy;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+DownloadProxy* WebContext::resumeDownload(const API::Data* resumeData, const String& path)
+{
+ DownloadProxy* downloadProxy = createDownloadProxy(ResourceRequest());
+
+ SandboxExtension::Handle sandboxExtensionHandle;
+ if (!path.isEmpty())
+ SandboxExtension::createHandle(path, SandboxExtension::ReadWrite, sandboxExtensionHandle);
+
+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess() && networkProcess()) {
+ networkProcess()->send(Messages::NetworkProcess::ResumeDownload(downloadProxy->downloadID(), resumeData->dataReference(), path, sandboxExtensionHandle), 0);
+ return downloadProxy;
+ }
+#endif
+
+ m_processes[0]->send(Messages::WebProcess::ResumeDownload(downloadProxy->downloadID(), resumeData->dataReference(), path, sandboxExtensionHandle), 0);
+ return downloadProxy;
+}
+
</ins><span class="cx"> void WebContext::postMessageToInjectedBundle(const String& messageName, API::Object* messageBody)
</span><span class="cx"> {
</span><span class="cx"> if (m_processes.isEmpty()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -179,6 +179,7 @@
</span><span class="cx"> const String& injectedBundlePath() const { return m_injectedBundlePath; }
</span><span class="cx">
</span><span class="cx"> DownloadProxy* download(WebPageProxy* initiatingPage, const WebCore::ResourceRequest&);
</span><ins>+ DownloadProxy* resumeDownload(const API::Data* resumeData, const String& path);
</ins><span class="cx">
</span><span class="cx"> void setInjectedBundleInitializationUserData(PassRefPtr<API::Object> userData) { m_injectedBundleInitializationUserData = userData; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -1057,6 +1057,11 @@
</span><span class="cx"> downloadManager().startDownload(downloadID, requestWithOriginalURL);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcess::resumeDownload(uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const WebKit::SandboxExtension::Handle& sandboxExtensionHandle)
+{
+ downloadManager().resumeDownload(downloadID, resumeData, path, sandboxExtensionHandle);
+}
+
</ins><span class="cx"> void WebProcess::cancelDownload(uint64_t downloadID)
</span><span class="cx"> {
</span><span class="cx"> downloadManager().cancelDownload(downloadID);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -236,6 +236,7 @@
</span><span class="cx"> void stopMemorySampler();
</span><span class="cx">
</span><span class="cx"> void downloadRequest(uint64_t downloadID, uint64_t initiatingPageID, const WebCore::ResourceRequest&);
</span><ins>+ void resumeDownload(uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
</ins><span class="cx"> void cancelDownload(uint64_t downloadID);
</span><span class="cx">
</span><span class="cx"> void setTextCheckerState(const TextCheckerState&);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (174986 => 174987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2014-10-21 17:32:09 UTC (rev 174986)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2014-10-21 17:46:11 UTC (rev 174987)
</span><span class="lines">@@ -61,8 +61,9 @@
</span><span class="cx"> void StopMemorySampler();
</span><span class="cx">
</span><span class="cx"> # Downloads. This should really be in a Download.messages.in, but it seemed unnecessary to create a new file just for
</span><del>- # two messages.
</del><ins>+ # three messages.
</ins><span class="cx"> DownloadRequest(uint64_t downloadID, uint64_t initiatingPageID, WebCore::ResourceRequest request)
</span><ins>+ ResumeDownload(uint64_t downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
</ins><span class="cx"> CancelDownload(uint64_t downloadID)
</span><span class="cx">
</span><span class="cx"> SetTextCheckerState(WebKit::TextCheckerState textCheckerState)
</span></span></pre>
</div>
</div>
</body>
</html>