<!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>[208526] trunk</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/208526">208526</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-11-09 23:46:17 -0800 (Wed, 09 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2][!NETWORK_SESSION] Add support for downloading file backed blobs
https://bugs.webkit.org/show_bug.cgi?id=164522
Reviewed by Alex Christensen.
Source/WebKit2:
Add support for downloading file backed blobs for the non-NETWORK_SESSION
code path of WebKit2, which is still use on pre-Sierra macOS.
* NetworkProcess/Downloads/Download.cpp:
(WebKit::Download::~Download):
* NetworkProcess/Downloads/Download.h:
(WebKit::Download::setBlobFileReferences):
* NetworkProcess/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::startDownload):
(WebKit::DownloadManager::convertNetworkLoadToDownload):
* NetworkProcess/Downloads/DownloadManager.h:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::convertToDownload):
LayoutTests:
Unskip corresponding tests now that they pass on Yosemite and El Capitan.
* platform/mac-wk2/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<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="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208525 => 208526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/LayoutTests/ChangeLog 2016-11-10 07:46:17 UTC (rev 208526)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-09 Chris Dumez <cdumez@apple.com>
+
+ [WK2][!NETWORK_SESSION] Add support for downloading file backed blobs
+ https://bugs.webkit.org/show_bug.cgi?id=164522
+
+ Reviewed by Alex Christensen.
+
+ Unskip corresponding tests now that they pass on Yosemite and El Capitan.
+
+ * platform/mac-wk2/TestExpectations:
+
</ins><span class="cx"> 2016-11-09 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: DebuggerManager.Event.Resumed introduces test flakiness
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (208525 => 208526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2016-11-10 07:46:17 UTC (rev 208526)
</span><span class="lines">@@ -494,10 +494,6 @@
</span><span class="cx"> # rdar://problem/26885345
</span><span class="cx"> [ Sierra+ ] media/click-placeholder-not-pausing.html [ Pass ]
</span><span class="cx">
</span><del>-# Download of file backed blob URLs is broken for !NETWORK_SESSION code path.
-webkit.org/b/164522 [ Yosemite ElCapitan ] fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download.html [ Failure ]
-webkit.org/b/164522 [ Yosemite ElCapitan ] fast/dom/HTMLAnchorElement/anchor-file-blob-download.html [ Failure ]
-
</del><span class="cx"> # RTL Scrollbars are enabled on Sierra WebKit2.
</span><span class="cx"> [ Sierra+ ] fast/scrolling/rtl-scrollbars.html [ Pass ]
</span><span class="cx"> [ Sierra+ ] fast/scrolling/rtl-scrollbars-simple.html [ Pass ]
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208525 => 208526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-10 07:46:17 UTC (rev 208526)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-11-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ [WK2][!NETWORK_SESSION] Add support for downloading file backed blobs
+ https://bugs.webkit.org/show_bug.cgi?id=164522
+
+ Reviewed by Alex Christensen.
+
+ Add support for downloading file backed blobs for the non-NETWORK_SESSION
+ code path of WebKit2, which is still use on pre-Sierra macOS.
+
+ * NetworkProcess/Downloads/Download.cpp:
+ (WebKit::Download::~Download):
+ * NetworkProcess/Downloads/Download.h:
+ (WebKit::Download::setBlobFileReferences):
+ * NetworkProcess/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::startDownload):
+ (WebKit::DownloadManager::convertNetworkLoadToDownload):
+ * NetworkProcess/Downloads/DownloadManager.h:
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::convertToDownload):
+
+2016-11-09 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> [WK2][NETWORK_SESSION] Add support for downloading file backed blobs
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164458
</span><span class="cx"> <rdar://problem/28905514>
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (208525 => 208526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-11-10 07:46:17 UTC (rev 208526)
</span><span class="lines">@@ -85,6 +85,9 @@
</span><span class="cx"> Download::~Download()
</span><span class="cx"> {
</span><span class="cx"> #if !USE(NETWORK_SESSION)
</span><ins>+ for (auto& fileReference : m_blobFileReferences)
+ fileReference->revokeFileAccess();
+
</ins><span class="cx"> if (m_resourceHandle) {
</span><span class="cx"> m_resourceHandle->clearClient();
</span><span class="cx"> m_resourceHandle->cancel();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h (208525 => 208526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-11-10 07:46:17 UTC (rev 208526)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class AuthenticationChallenge;
</span><ins>+class BlobDataFileReference;
</ins><span class="cx"> class Credential;
</span><span class="cx"> class ResourceError;
</span><span class="cx"> class ResourceHandle;
</span><span class="lines">@@ -86,6 +87,8 @@
</span><span class="cx"> ~Download();
</span><span class="cx">
</span><span class="cx"> #if !USE(NETWORK_SESSION)
</span><ins>+ void setBlobFileReferences(Vector<RefPtr<WebCore::BlobDataFileReference>>&& fileReferences) { m_blobFileReferences = WTFMove(fileReferences); }
+
</ins><span class="cx"> void start();
</span><span class="cx"> void startWithHandle(WebCore::ResourceHandle*, const WebCore::ResourceResponse&);
</span><span class="cx"> #endif
</span><span class="lines">@@ -132,6 +135,7 @@
</span><span class="cx"> DownloadManager& m_downloadManager;
</span><span class="cx"> DownloadID m_downloadID;
</span><span class="cx">
</span><ins>+ Vector<RefPtr<WebCore::BlobDataFileReference>> m_blobFileReferences;
</ins><span class="cx"> RefPtr<SandboxExtension> m_sandboxExtension;
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (208525 => 208526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-11-10 07:46:17 UTC (rev 208526)
</span><span class="lines">@@ -57,11 +57,17 @@
</span><span class="cx"> parameters.request = request;
</span><span class="cx"> parameters.clientCredentialPolicy = ClientCredentialPolicy::MayAskClientForCredentials;
</span><span class="cx"> if (request.url().protocolIsBlob() && connection)
</span><del>- parameters.blobFileReferences = NetworkBlobRegistry::singleton().filesInBlob(*connection, parameters.request.url());
</del><ins>+ parameters.blobFileReferences = NetworkBlobRegistry::singleton().filesInBlob(*connection, request.url());
</ins><span class="cx">
</span><span class="cx"> m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(WTFMove(parameters), downloadID, *networkSession, suggestedName));
</span><span class="cx"> #else
</span><span class="cx"> auto download = std::make_unique<Download>(*this, downloadID, request, suggestedName);
</span><ins>+ if (request.url().protocolIsBlob() && connection) {
+ auto blobFileReferences = NetworkBlobRegistry::singleton().filesInBlob(*connection, request.url());
+ for (auto& fileReference : blobFileReferences)
+ fileReference->prepareForFileAccess();
+ download->setBlobFileReferences(WTFMove(blobFileReferences));
+ }
</ins><span class="cx"> download->start();
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_downloads.contains(downloadID));
</span><span class="lines">@@ -105,7 +111,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // USE(NETWORK_SESSION)
</span><span class="cx">
</span><del>-void DownloadManager::convertNetworkLoadToDownload(DownloadID downloadID, std::unique_ptr<NetworkLoad>&& networkLoad, const ResourceRequest& request, const ResourceResponse& response)
</del><ins>+void DownloadManager::convertNetworkLoadToDownload(DownloadID downloadID, std::unique_ptr<NetworkLoad>&& networkLoad, Vector<RefPtr<WebCore::BlobDataFileReference>>&& blobFileReferences, const ResourceRequest& request, const ResourceResponse& response)
</ins><span class="cx"> {
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> ASSERT(!m_pendingDownloads.contains(downloadID));
</span><span class="lines">@@ -112,6 +118,7 @@
</span><span class="cx"> m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(WTFMove(networkLoad), downloadID, request, response));
</span><span class="cx"> #else
</span><span class="cx"> auto download = std::make_unique<Download>(*this, downloadID, request);
</span><ins>+ download->setBlobFileReferences(WTFMove(blobFileReferences));
</ins><span class="cx">
</span><span class="cx"> auto* handle = networkLoad->handle();
</span><span class="cx"> ASSERT(handle);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (208525 => 208526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-11-10 07:46:17 UTC (rev 208526)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+class BlobDataFileReference;
</ins><span class="cx"> class ResourceHandle;
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> class ResourceResponse;
</span><span class="lines">@@ -83,7 +84,7 @@
</span><span class="cx"> void continueWillSendRequest(DownloadID, WebCore::ResourceRequest&&);
</span><span class="cx"> void willDecidePendingDownloadDestination(NetworkDataTask&, ResponseCompletionHandler&&);
</span><span class="cx"> #endif
</span><del>- void convertNetworkLoadToDownload(DownloadID, std::unique_ptr<NetworkLoad>&&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</del><ins>+ void convertNetworkLoadToDownload(DownloadID, std::unique_ptr<NetworkLoad>&&, Vector<RefPtr<WebCore::BlobDataFileReference>>&&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</ins><span class="cx"> void continueDecidePendingDownloadDestination(DownloadID, String destination, const SandboxExtension::Handle&, bool allowOverwrite);
</span><span class="cx">
</span><span class="cx"> void resumeDownload(WebCore::SessionID, DownloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (208525 => 208526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-11-10 07:46:01 UTC (rev 208525)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-11-10 07:46:17 UTC (rev 208526)
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx"> void NetworkResourceLoader::convertToDownload(DownloadID downloadID, const ResourceRequest& request, const ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_networkLoad);
</span><del>- NetworkProcess::singleton().downloadManager().convertNetworkLoadToDownload(downloadID, WTFMove(m_networkLoad), request, response);
</del><ins>+ NetworkProcess::singleton().downloadManager().convertNetworkLoadToDownload(downloadID, WTFMove(m_networkLoad), WTFMove(m_fileReferences), request, response);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::abort()
</span></span></pre>
</div>
</div>
</body>
</html>