<!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>[206439] 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/206439">206439</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-09-27 09:58:41 -0700 (Tue, 27 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Navigating to a Blob URL does not trigger a download
https://bugs.webkit.org/show_bug.cgi?id=162574
Reviewed by Darin Adler.
Source/WebKit2:
Add support for converting Blob URL loads into downloads.
* NetworkProcess/Downloads/BlobDownloadClient.cpp:
(WebKit::BlobDownloadClient::didReceiveResponseAsync):
Make sure we return a valid suggested filename because the client side (Safari)
does not deal with empty suggested filenames. Use "unknown" by default to
match the default suggested filename of non-Blob downloads.
* NetworkProcess/Downloads/Download.cpp:
(WebKit::Download::startWithHandle):
* NetworkProcess/Downloads/Download.h:
* NetworkProcess/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::convertHandleToDownload):
* NetworkProcess/Downloads/DownloadManager.h:
* NetworkProcess/Downloads/ios/DownloadIOS.mm:
(WebKit::Download::startNetworkLoadWithHandle):
* NetworkProcess/Downloads/mac/DownloadMac.mm:
(WebKit::Download::startNetworkLoadWithHandle):
* NetworkProcess/Downloads/soup/DownloadSoup.cpp:
(WebKit::Download::startNetworkLoadWithHandle):
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload):
* NetworkProcess/NetworkLoad.h:
(WebKit::NetworkLoad::handle):
Tools:
Add API that tests navigating to a Blob URL and checks that that the load
properly gets converted into a download.
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
(-[BlobDownloadDelegate _downloadDidStart:]):
(-[BlobDownloadDelegate _download:didReceiveResponse:]):
(-[BlobDownloadDelegate _download:didReceiveData:]):
(-[BlobDownloadDelegate _download:decideDestinationWithSuggestedFilename:allowOverwrite:]):
(-[BlobDownloadDelegate _downloadDidFinish:]):
(-[DownloadBlobURLNavigationDelegate webView:decidePolicyForNavigationAction:decisionHandler:]):
(TEST):
* TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestBlobURL.html: Added.
LayoutTests:
Rebaseline now that the suggested download name is "unknown" by default
for blob downloads as well.
* fast/dom/HTMLAnchorElement/anchor-download-expected.txt:
* fast/dom/HTMLAnchorElement/anchor-nodownload-set-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLAnchorElementanchordownloadexpectedtxt">trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-download-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLAnchorElementanchornodownloadsetexpectedtxt">trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-nodownload-set-expected.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsBlobDownloadClientcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.cpp</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="#trunkSourceWebKit2NetworkProcessDownloadsiosDownloadIOSmm">trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsmacDownloadMacmm">trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadssoupDownloadSoupcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadh">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaDownloadmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaDownloadRequestBlobURLhtml">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestBlobURL.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/LayoutTests/ChangeLog 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-09-27 Chris Dumez <cdumez@apple.com>
+
+ [WK2] Navigating to a Blob URL does not trigger a download
+ https://bugs.webkit.org/show_bug.cgi?id=162574
+
+ Reviewed by Darin Adler.
+
+ Rebaseline now that the suggested download name is "unknown" by default
+ for blob downloads as well.
+
+ * fast/dom/HTMLAnchorElement/anchor-download-expected.txt:
+ * fast/dom/HTMLAnchorElement/anchor-nodownload-set-expected.txt:
+
</ins><span class="cx"> 2016-09-27 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r205883): Letterpressed text is invisible
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLAnchorElementanchordownloadexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-download-expected.txt (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-download-expected.txt 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-download-expected.txt 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx"> Download started.
</span><del>-Downloading URL with suggested filename ""
</del><ins>+Downloading URL with suggested filename "unknown"
</ins><span class="cx"> Download completed.
</span><span class="cx"> Blob URL
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLAnchorElementanchornodownloadsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-nodownload-set-expected.txt (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-nodownload-set-expected.txt 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-nodownload-set-expected.txt 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx"> Download started.
</span><del>-Downloading URL with suggested filename ""
</del><ins>+Downloading URL with suggested filename "unknown"
</ins><span class="cx"> Download completed.
</span><span class="cx"> Blob URL
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-09-27 Chris Dumez <cdumez@apple.com>
+
+ [WK2] Navigating to a Blob URL does not trigger a download
+ https://bugs.webkit.org/show_bug.cgi?id=162574
+
+ Reviewed by Darin Adler.
+
+ Add support for converting Blob URL loads into downloads.
+
+ * NetworkProcess/Downloads/BlobDownloadClient.cpp:
+ (WebKit::BlobDownloadClient::didReceiveResponseAsync):
+ Make sure we return a valid suggested filename because the client side (Safari)
+ does not deal with empty suggested filenames. Use "unknown" by default to
+ match the default suggested filename of non-Blob downloads.
+
+ * NetworkProcess/Downloads/Download.cpp:
+ (WebKit::Download::startWithHandle):
+ * NetworkProcess/Downloads/Download.h:
+ * NetworkProcess/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::convertHandleToDownload):
+ * NetworkProcess/Downloads/DownloadManager.h:
+ * NetworkProcess/Downloads/ios/DownloadIOS.mm:
+ (WebKit::Download::startNetworkLoadWithHandle):
+ * NetworkProcess/Downloads/mac/DownloadMac.mm:
+ (WebKit::Download::startNetworkLoadWithHandle):
+ * NetworkProcess/Downloads/soup/DownloadSoup.cpp:
+ (WebKit::Download::startNetworkLoadWithHandle):
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload):
+ * NetworkProcess/NetworkLoad.h:
+ (WebKit::NetworkLoad::handle):
+
</ins><span class="cx"> 2016-09-27 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Unreviewed typo fix
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsBlobDownloadClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.cpp (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.cpp 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.cpp 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> void BlobDownloadClient::didReceiveResponseAsync(ResourceHandle*, ResourceResponse&& response)
</span><span class="cx"> {
</span><span class="cx"> m_download.didReceiveResponse(WTFMove(response));
</span><del>- m_download.decideDestinationWithSuggestedFilenameAsync(m_download.suggestedName());
</del><ins>+ m_download.decideDestinationWithSuggestedFilenameAsync(m_download.suggestedName().isEmpty() ? "unknown" : m_download.suggestedName());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobDownloadClient::didDecideDownloadDestination(const String& destinationPath, bool allowOverwrite)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -97,6 +97,24 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& response)
+{
+ if (m_request.url().protocolIsBlob()) {
+ m_downloadClient = std::make_unique<BlobDownloadClient>(*this);
+ m_resourceHandle = ResourceHandle::create(nullptr, m_request, m_downloadClient.get(), false, false);
+ didStart();
+ return;
+ }
+
+#if USE(NETWORK_SESSION)
+ UNUSED_PARAM(handle);
+ UNUSED_PARAM(response);
+ ASSERT_NOT_REACHED();
+#else
+ startNetworkLoadWithHandle(handle, response);
+#endif
+}
+
</ins><span class="cx"> void Download::cancel()
</span><span class="cx"> {
</span><span class="cx"> if (m_request.url().protocolIsBlob()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -80,10 +80,7 @@
</span><span class="cx"> ~Download();
</span><span class="cx">
</span><span class="cx"> void start();
</span><del>-
-#if !USE(NETWORK_SESSION)
</del><span class="cx"> void startWithHandle(WebCore::ResourceHandle*, const WebCore::ResourceResponse&);
</span><del>-#endif
</del><span class="cx"> void resume(const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
</span><span class="cx"> void cancel();
</span><span class="cx">
</span><span class="lines">@@ -119,6 +116,7 @@
</span><span class="cx">
</span><span class="cx"> #if !USE(NETWORK_SESSION)
</span><span class="cx"> void startNetworkLoad();
</span><ins>+ void startNetworkLoadWithHandle(WebCore::ResourceHandle*, const WebCore::ResourceResponse&);
</ins><span class="cx"> #endif
</span><span class="cx"> void cancelNetworkLoad();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -105,7 +105,8 @@
</span><span class="cx"> auto addResult = m_downloadsWaitingForDestination.set(downloadID, std::make_pair<RefPtr<NetworkDataTask>, ResponseCompletionHandler>(&networkDataTask, WTFMove(completionHandler)));
</span><span class="cx"> ASSERT_UNUSED(addResult, addResult.isNewEntry);
</span><span class="cx"> }
</span><del>-#else
</del><ins>+#endif
+
</ins><span class="cx"> void DownloadManager::convertHandleToDownload(DownloadID downloadID, ResourceHandle* handle, const ResourceRequest& request, const ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> auto download = std::make_unique<Download>(*this, downloadID, request);
</span><span class="lines">@@ -114,7 +115,6 @@
</span><span class="cx"> ASSERT(!m_downloads.contains(downloadID));
</span><span class="cx"> m_downloads.add(downloadID, WTFMove(download));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void DownloadManager::continueDecidePendingDownloadDestination(DownloadID downloadID, String destination, const SandboxExtension::Handle& sandboxExtensionHandle, bool allowOverwrite)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -36,9 +36,7 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-#if !USE(NETWORK_SESSION)
</del><span class="cx"> class ResourceHandle;
</span><del>-#endif
</del><span class="cx"> class ResourceRequest;
</span><span class="cx"> class ResourceResponse;
</span><span class="cx"> class SessionID;
</span><span class="lines">@@ -80,9 +78,8 @@
</span><span class="cx"> void continueCanAuthenticateAgainstProtectionSpace(DownloadID, bool canAuthenticate);
</span><span class="cx"> void continueWillSendRequest(DownloadID, WebCore::ResourceRequest&&);
</span><span class="cx"> void willDecidePendingDownloadDestination(NetworkDataTask&, ResponseCompletionHandler&&);
</span><del>-#else
</del><ins>+#endif
</ins><span class="cx"> void convertHandleToDownload(DownloadID, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</span><del>-#endif
</del><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="trunkSourceWebKit2NetworkProcessDownloadsiosDownloadIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& response)
</del><ins>+void Download::startNetworkLoadWithHandle(ResourceHandle* handle, const ResourceResponse& response)
</ins><span class="cx"> {
</span><span class="cx"> CFURLDownloadClient client;
</span><span class="cx"> setUpDownloadClient(client, *this);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsmacDownloadMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> [m_nsURLDownload setDeletesFileUponFailure:NO];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& response)
</del><ins>+void Download::startNetworkLoadWithHandle(ResourceHandle* handle, const ResourceResponse& response)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_nsURLDownload);
</span><span class="cx"> ASSERT(!m_delegate);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadssoupDownloadSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> didStart();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Download::startWithHandle(ResourceHandle* resourceHandle, const ResourceResponse& response)
</del><ins>+void Download::startNetworkLoadWithHandle(ResourceHandle* resourceHandle, const ResourceResponse& response)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_downloadClient);
</span><span class="cx"> ASSERT(!m_resourceHandle);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -207,14 +207,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- loader->networkLoad()->convertTaskToDownload(downloadID, request, response);
-#else
</del><ins>+ if (!request.url().protocolIsBlob()) {
+ loader->networkLoad()->convertTaskToDownload(downloadID, request, response);
+ loader->didConvertToDownload();
+ return;
+ }
+#endif
</ins><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><del>-
-#endif
</del><ins>+
</ins><span class="cx"> loader->didConvertToDownload();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -116,9 +116,7 @@
</span><span class="cx"> void continueCanAuthenticateAgainstProtectionSpace(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !USE(NETWORK_SESSION)
</del><span class="cx"> WebCore::ResourceHandle* handle() const { return m_handle.get(); }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NetworkLoadClient::ShouldContinueDidReceiveResponse sharedDidReceiveResponse(WebCore::ResourceResponse&&);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Tools/ChangeLog 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-09-27 Chris Dumez <cdumez@apple.com>
+
+ [WK2] Navigating to a Blob URL does not trigger a download
+ https://bugs.webkit.org/show_bug.cgi?id=162574
+
+ Reviewed by Darin Adler.
+
+ Add API that tests navigating to a Blob URL and checks that that the load
+ properly gets converted into a download.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
+ (-[BlobDownloadDelegate _downloadDidStart:]):
+ (-[BlobDownloadDelegate _download:didReceiveResponse:]):
+ (-[BlobDownloadDelegate _download:didReceiveData:]):
+ (-[BlobDownloadDelegate _download:decideDestinationWithSuggestedFilename:allowOverwrite:]):
+ (-[BlobDownloadDelegate _downloadDidFinish:]):
+ (-[DownloadBlobURLNavigationDelegate webView:decidePolicyForNavigationAction:decisionHandler:]):
+ (TEST):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestBlobURL.html: Added.
+
</ins><span class="cx"> 2016-09-27 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Install binaries to pkglibexecdir rather than bindir
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -396,6 +396,7 @@
</span><span class="cx"> 7CEFA9661AC0B9E200B910FD /* _WKUserContentExtensionStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CEFA9641AC0B9E200B910FD /* _WKUserContentExtensionStore.mm */; };
</span><span class="cx"> 7CFBCAE51743238F00B2BFCF /* WillLoad_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CFBCAE31743238E00B2BFCF /* WillLoad_Bundle.cpp */; };
</span><span class="cx"> 835CF9671D25FCD6001A65D4 /* RestoreSessionStateWithoutNavigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 835CF9661D25FCD6001A65D4 /* RestoreSessionStateWithoutNavigation.cpp */; };
</span><ins>+ 837A35F11D9A1E7D00663C57 /* DownloadRequestBlobURL.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 837A35F01D9A1E6400663C57 /* DownloadRequestBlobURL.html */; };
</ins><span class="cx"> 83CF1C301C4F1B8B00688447 /* StringUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83CF1C2C1C4F19AE00688447 /* StringUtilities.mm */; };
</span><span class="cx"> 930AD402150698D00067970F /* lots-of-text.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 930AD401150698B30067970F /* lots-of-text.html */; };
</span><span class="cx"> 932AE53D1D371047005DFFAF /* focus-inputs.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93575C551D30366E000D604D /* focus-inputs.html */; };
</span><span class="lines">@@ -546,6 +547,7 @@
</span><span class="cx"> dstPath = TestWebKitAPI.resources;
</span><span class="cx"> dstSubfolderSpec = 7;
</span><span class="cx"> files = (
</span><ins>+ 837A35F11D9A1E7D00663C57 /* DownloadRequestBlobURL.html in Copy Resources */,
</ins><span class="cx"> 2E9896151D8F093800739892 /* text-and-password-inputs.html in Copy Resources */,
</span><span class="cx"> F42DA5161D8CEFE400336F40 /* large-input-field-focus-onload.html in Copy Resources */,
</span><span class="cx"> 2EFF06CD1D8A429A0004BB30 /* input-field-in-scrollable-document.html in Copy Resources */,
</span><span class="lines">@@ -980,6 +982,7 @@
</span><span class="cx"> 7CFBCAE31743238E00B2BFCF /* WillLoad_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WillLoad_Bundle.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 81B50192140F232300D9EB58 /* StringBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringBuilder.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 835CF9661D25FCD6001A65D4 /* RestoreSessionStateWithoutNavigation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RestoreSessionStateWithoutNavigation.cpp; sourceTree = "<group>"; };
</span><ins>+ 837A35F01D9A1E6400663C57 /* DownloadRequestBlobURL.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = DownloadRequestBlobURL.html; sourceTree = "<group>"; };
</ins><span class="cx"> 83B88A331C80056D00BB2418 /* HTMLParserIdioms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLParserIdioms.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 83CF1C2C1C4F19AE00688447 /* StringUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StringUtilities.mm; sourceTree = "<group>"; };
</span><span class="cx"> 86BD19971A2DB05B006DCF0A /* RefCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RefCounter.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -1500,6 +1503,7 @@
</span><span class="cx"> 2DE71AFF1D49C2F000904094 /* blinking-div.html */,
</span><span class="cx"> A16F66B91C40EA2000BD4D24 /* ContentFiltering.html */,
</span><span class="cx"> 5C2936941D5BFD1900DEAB1E /* CookieMessage.html */,
</span><ins>+ 837A35F01D9A1E6400663C57 /* DownloadRequestBlobURL.html */,
</ins><span class="cx"> 5714ECB81CA8B58800051AC8 /* DownloadRequestOriginalURL.html */,
</span><span class="cx"> 5714ECBC1CA8C21800051AC8 /* DownloadRequestOriginalURL2.html */,
</span><span class="cx"> 5714ECBA1CA8BFD100051AC8 /* DownloadRequestOriginalURLFrame.html */,
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaDownloadmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm (206438 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm 2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -342,5 +342,85 @@
</span><span class="cx"> TestWebKitAPI::Util::run(&isDone);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@interface BlobDownloadDelegate : NSObject <_WKDownloadDelegate>
+@end
+
+@implementation BlobDownloadDelegate {
+ RetainPtr<_WKDownload> _download;
+ String _destinationPath;
+ long long _expectedContentLength;
+ uint64_t _receivedContentLength;
+}
+
+- (void)_downloadDidStart:(_WKDownload *)download
+{
+ EXPECT_NULL(_download);
+ EXPECT_NOT_NULL(download);
+ EXPECT_TRUE([[[[download request] URL] scheme] isEqualToString:@"blob"]);
+ _download = download;
+}
+
+- (void)_download:(_WKDownload *)download didReceiveResponse:(NSURLResponse *)response
+{
+ hasReceivedResponse = true;
+ EXPECT_EQ(_download, download);
+ EXPECT_EQ(_expectedContentLength, 0U);
+ EXPECT_EQ(_receivedContentLength, 0U);
+ EXPECT_TRUE([[[response URL] scheme] isEqualToString:@"blob"]);
+ _expectedContentLength = [response expectedContentLength];
+}
+
+- (void)_download:(_WKDownload *)download didReceiveData:(uint64_t)length
+{
+ EXPECT_EQ(_download, download);
+ _receivedContentLength += length;
+}
+
+- (NSString *)_download:(_WKDownload *)download decideDestinationWithSuggestedFilename:(NSString *)filename allowOverwrite:(BOOL *)allowOverwrite
+{
+ EXPECT_TRUE(hasReceivedResponse);
+ EXPECT_EQ(_download, download);
+
+ WebCore::PlatformFileHandle fileHandle;
+ _destinationPath = WebCore::openTemporaryFile("TestWebKitAPI", fileHandle);
+ EXPECT_TRUE(fileHandle != WebCore::invalidPlatformFileHandle);
+ WebCore::closeFile(fileHandle);
+
+ *allowOverwrite = YES;
+ return _destinationPath;
+}
+
+- (void)_downloadDidFinish:(_WKDownload *)download
+{
+ EXPECT_EQ(_download, download);
+ EXPECT_TRUE(_expectedContentLength == NSURLResponseUnknownLength || static_cast<uint64_t>(_expectedContentLength) == _receivedContentLength);
+ NSString* expectedContent = @"{\"x\":42,\"s\":\"hello, world\"}";
+ NSData* expectedData = [expectedContent dataUsingEncoding:NSUTF8StringEncoding];
+ EXPECT_TRUE([[[NSFileManager defaultManager] contentsAtPath:_destinationPath] isEqualToData:expectedData]);
+ WebCore::deleteFile(_destinationPath);
+ isDone = true;
+}
+
+@end
+
+@interface DownloadBlobURLNavigationDelegate : NSObject <WKNavigationDelegate>
+@end
+
+@implementation DownloadBlobURLNavigationDelegate
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
+{
+ if ([navigationAction.request.URL.scheme isEqualToString:@"blob"])
+ decisionHandler(_WKNavigationActionPolicyDownload);
+ else
+ decisionHandler(WKNavigationActionPolicyAllow);
+}
+@end
+
+TEST(_WKDownload, DownloadRequestBlobURL)
+{
+ NSURL *originalURL = [[NSBundle mainBundle] URLForResource:@"DownloadRequestBlobURL" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"];
+ runTest(adoptNS([[DownloadBlobURLNavigationDelegate alloc] init]).get(), adoptNS([[BlobDownloadDelegate alloc] init]).get(), originalURL);
+}
+
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaDownloadRequestBlobURLhtml"></a>
<div class="addfile"><h4>Added: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestBlobURL.html (0 => 206439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestBlobURL.html (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestBlobURL.html 2016-09-27 16:58:41 UTC (rev 206439)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<a id="href" href="simple.html">download</a>
+<script>
+ var element = document.getElementById("href");
+ var data = { x: 42, s: "hello, world" };
+ var json = JSON.stringify(data);
+ var blob = new Blob([json], {type: "octet/stream"});
+ var url = window.URL.createObjectURL(blob);
+
+ element.href = url;
+ element.click();
+</script>
+</body>
+</html>
</ins></span></pre>
</div>
</div>
</body>
</html>