<!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>[206355] 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/206355">206355</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-09-24 18:00:02 -0700 (Sat, 24 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] anchor.download attribute value is ignored by NETWORK_SESSION code path
https://bugs.webkit.org/show_bug.cgi?id=162531
Reviewed by Darin Adler.
Source/WebKit2:
Pipe the suggested filename through in the NETWORK_SESSION code path so
that it is used when deciding the destination path.
* NetworkProcess/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::startDownload):
* NetworkProcess/Downloads/PendingDownload.cpp:
(WebKit::PendingDownload::PendingDownload):
* NetworkProcess/Downloads/PendingDownload.h:
* NetworkProcess/NetworkDataTask.h:
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::setSuggestedFilename):
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
(WebKit::NetworkDataTask::suggestedFilename):
(WebKit::NetworkDataTask::setSuggestedFilename):
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):
Tools:
Update decideDestinationWithSuggestedFilename() to return a actual file path
instead of nullptr. The NETWORK_SESSION code path cancels the download when
decideDestinationWithSuggestedFilename() returns an empty file path, unlike
the !NETWORK_SESSION code path that just continue downloading without
explicitely setting a destination path. This lead to different test results
for NETWORK_SESSION and !NETWORK_SESSION code paths. Returns a valid
destination path makes more sense and leads to consistent results.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::decideDestinationWithSuggestedFilename):
LayoutTests:
Unskip tests that are now passing.
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadh">trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkDataTaskh">trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.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="#trunkSourceWebKit2NetworkProcesscocoaNetworkDataTaskCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206354 => 206355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-25 00:43:38 UTC (rev 206354)
+++ trunk/LayoutTests/ChangeLog 2016-09-25 01:00:02 UTC (rev 206355)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-24 Chris Dumez <cdumez@apple.com>
+
+ [WK2] anchor.download attribute value is ignored by NETWORK_SESSION code path
+ https://bugs.webkit.org/show_bug.cgi?id=162531
+
+ Reviewed by Darin Adler.
+
+ Unskip tests that are now passing.
+
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2016-09-23 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: !newRelayoutRoot.container() || is<RenderView>(newRelayoutRoot.container()) || !newRelayoutRoot.container()->needsLayout() while loading sohu.com
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (206354 => 206355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-09-25 00:43:38 UTC (rev 206354)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-09-25 01:00:02 UTC (rev 206355)
</span><span class="lines">@@ -1383,8 +1383,6 @@
</span><span class="cx"> # <rdar://problem/25536266> [Mac][iOS][NETWORK_SESSION] Unable to download BLOB URLs (156180)
</span><span class="cx"> [ Sierra+ ] fast/dom/HTMLAnchorElement/anchor-download.html [ Skip ]
</span><span class="cx"> [ Sierra+ ] fast/dom/HTMLAnchorElement/anchor-nodownload-set.html [ Skip ]
</span><del>-[ Sierra+ ] http/tests/security/anchor-download-allow-data.html [ Skip ]
-[ Sierra+ ] http/tests/security/anchor-download-allow-sameorigin.html [ Skip ]
</del><span class="cx"> [ Sierra+ ] http/tests/security/anchor-download-allow-blob.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> # <rdar://problem/25780035> CSP does not ignore paths for media redirects
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (206354 => 206355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-25 00:43:38 UTC (rev 206354)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-25 01:00:02 UTC (rev 206355)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-09-24 Chris Dumez <cdumez@apple.com>
+
+ [WK2] anchor.download attribute value is ignored by NETWORK_SESSION code path
+ https://bugs.webkit.org/show_bug.cgi?id=162531
+
+ Reviewed by Darin Adler.
+
+ Pipe the suggested filename through in the NETWORK_SESSION code path so
+ that it is used when deciding the destination path.
+
+ * NetworkProcess/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::startDownload):
+ * NetworkProcess/Downloads/PendingDownload.cpp:
+ (WebKit::PendingDownload::PendingDownload):
+ * NetworkProcess/Downloads/PendingDownload.h:
+ * NetworkProcess/NetworkDataTask.h:
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::setSuggestedFilename):
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+ (WebKit::NetworkDataTask::suggestedFilename):
+ (WebKit::NetworkDataTask::setSuggestedFilename):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):
+
</ins><span class="cx"> 2016-09-23 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Media controls playhead does not animate smoothly while playing
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (206354 => 206355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-09-25 00:43:38 UTC (rev 206354)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-09-25 01:00:02 UTC (rev 206355)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> parameters.sessionID = sessionID;
</span><span class="cx"> parameters.request = request;
</span><span class="cx"> parameters.clientCredentialPolicy = ClientCredentialPolicy::MayAskClientForCredentials;
</span><del>- m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(WTFMove(parameters), downloadID, *networkSession));
</del><ins>+ m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(WTFMove(parameters), downloadID, *networkSession, suggestedName));
</ins><span class="cx"> #else
</span><span class="cx"> auto download = std::make_unique<Download>(*this, downloadID, request, suggestedName);
</span><span class="cx"> download->start();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp (206354 => 206355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp 2016-09-25 00:43:38 UTC (rev 206354)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp 2016-09-25 01:00:02 UTC (rev 206355)
</span><span class="lines">@@ -38,11 +38,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-PendingDownload::PendingDownload(NetworkLoadParameters&& parameters, DownloadID downloadID, NetworkSession& networkSession)
</del><ins>+PendingDownload::PendingDownload(NetworkLoadParameters&& parameters, DownloadID downloadID, NetworkSession& networkSession, const String& suggestedName)
</ins><span class="cx"> : m_networkLoad(std::make_unique<NetworkLoad>(*this, WTFMove(parameters), networkSession))
</span><span class="cx"> {
</span><span class="cx"> m_networkLoad->setPendingDownloadID(downloadID);
</span><span class="cx"> m_networkLoad->setPendingDownload(*this);
</span><ins>+ m_networkLoad->setSuggestedFilename(suggestedName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PendingDownload::willSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&& redirectResponse)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h (206354 => 206355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h 2016-09-25 00:43:38 UTC (rev 206354)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h 2016-09-25 01:00:02 UTC (rev 206355)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> class PendingDownload : public NetworkLoadClient, public IPC::MessageSender {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- PendingDownload(NetworkLoadParameters&&, DownloadID, NetworkSession&);
</del><ins>+ PendingDownload(NetworkLoadParameters&&, DownloadID, NetworkSession&, const String& suggestedName);
</ins><span class="cx">
</span><span class="cx"> void continueWillSendRequest(WebCore::ResourceRequest&&);
</span><span class="cx"> void continueCanAuthenticateAgainstProtectionSpace(bool canAuthenticate);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkDataTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h (206354 => 206355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h 2016-09-25 00:43:38 UTC (rev 206354)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h 2016-09-25 01:00:02 UTC (rev 206355)
</span><span class="lines">@@ -127,6 +127,7 @@
</span><span class="cx"> const WebCore::ResourceRequest& firstRequest() const { return m_firstRequest; }
</span><span class="cx"> WebCore::ResourceRequest currentRequest();
</span><span class="cx"> String suggestedFilename();
</span><ins>+ void setSuggestedFilename(const String&);
</ins><span class="cx"> void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler&&);
</span><span class="cx"> void transferSandboxExtensionToDownload(Download&);
</span><span class="cx"> bool allowsSpecificHTTPSCertificateForHost(const WebCore::AuthenticationChallenge&);
</span><span class="lines">@@ -164,6 +165,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> RetainPtr<NSURLSessionDataTask> m_task;
</span><span class="cx"> #endif
</span><ins>+ String m_suggestedFilename;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (206354 => 206355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-09-25 00:43:38 UTC (rev 206354)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-09-25 01:00:02 UTC (rev 206355)
</span><span class="lines">@@ -201,6 +201,14 @@
</span><span class="cx"> m_task->setPendingDownloadID(downloadID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkLoad::setSuggestedFilename(const String& suggestedName)
+{
+ if (!m_task)
+ return;
+
+ m_task->setSuggestedFilename(suggestedName);
+}
+
</ins><span class="cx"> void NetworkLoad::setPendingDownload(PendingDownload& pendingDownload)
</span><span class="cx"> {
</span><span class="cx"> if (!m_task)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (206354 => 206355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-09-25 00:43:38 UTC (rev 206354)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-09-25 01:00:02 UTC (rev 206355)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> void convertTaskToDownload(DownloadID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</span><span class="cx"> void setPendingDownloadID(DownloadID);
</span><ins>+ void setSuggestedFilename(const String&);
</ins><span class="cx"> void setPendingDownload(PendingDownload&);
</span><span class="cx"> DownloadID pendingDownloadID() { return m_task->pendingDownloadID(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkDataTaskCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (206354 => 206355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2016-09-25 00:43:38 UTC (rev 206354)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2016-09-25 01:00:02 UTC (rev 206355)
</span><span class="lines">@@ -371,9 +371,16 @@
</span><span class="cx">
</span><span class="cx"> String NetworkDataTask::suggestedFilename()
</span><span class="cx"> {
</span><ins>+ if (!m_suggestedFilename.isEmpty())
+ return m_suggestedFilename;
</ins><span class="cx"> return m_task.get().response.suggestedFilename;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkDataTask::setSuggestedFilename(const String& suggestedName)
+{
+ m_suggestedFilename = suggestedName;
+}
+
</ins><span class="cx"> WebCore::ResourceRequest NetworkDataTask::currentRequest()
</span><span class="cx"> {
</span><span class="cx"> return [m_task currentRequest];
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (206354 => 206355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-09-25 00:43:38 UTC (rev 206354)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-09-25 01:00:02 UTC (rev 206355)
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> if (auto* networkDataTask = _session->dataTaskForIdentifier([dataTask taskIdentifier], storedCredentials)) {
</span><span class="cx"> auto downloadID = networkDataTask->pendingDownloadID();
</span><span class="cx"> auto& downloadManager = WebKit::NetworkProcess::singleton().downloadManager();
</span><del>- auto download = std::make_unique<WebKit::Download>(downloadManager, downloadID, downloadTask, _session->sessionID());
</del><ins>+ auto download = std::make_unique<WebKit::Download>(downloadManager, downloadID, downloadTask, _session->sessionID(), networkDataTask->suggestedFilename());
</ins><span class="cx"> networkDataTask->transferSandboxExtensionToDownload(*download);
</span><span class="cx"> ASSERT(WebCore::fileExists(networkDataTask->pendingDownloadLocation()));
</span><span class="cx"> download->didCreateDestination(networkDataTask->pendingDownloadLocation());
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206354 => 206355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-25 00:43:38 UTC (rev 206354)
+++ trunk/Tools/ChangeLog 2016-09-25 01:00:02 UTC (rev 206355)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-09-24 Chris Dumez <cdumez@apple.com>
+
+ [WK2] anchor.download attribute value is ignored by NETWORK_SESSION code path
+ https://bugs.webkit.org/show_bug.cgi?id=162531
+
+ Reviewed by Darin Adler.
+
+ Update decideDestinationWithSuggestedFilename() to return a actual file path
+ instead of nullptr. The NETWORK_SESSION code path cancels the download when
+ decideDestinationWithSuggestedFilename() returns an empty file path, unlike
+ the !NETWORK_SESSION code path that just continue downloading without
+ explicitely setting a destination path. This lead to different test results
+ for NETWORK_SESSION and !NETWORK_SESSION code paths. Returns a valid
+ destination path makes more sense and leads to consistent results.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::decideDestinationWithSuggestedFilename):
+
</ins><span class="cx"> 2016-09-23 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> [mac-sierra] 2 WKWebViewCandidateTests API test failures
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (206354 => 206355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-09-25 00:43:38 UTC (rev 206354)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-09-25 01:00:02 UTC (rev 206355)
</span><span class="lines">@@ -1673,14 +1673,25 @@
</span><span class="cx">
</span><span class="cx"> WKStringRef TestController::decideDestinationWithSuggestedFilename(WKContextRef, WKDownloadRef, WKStringRef filename, bool*& allowOverwrite)
</span><span class="cx"> {
</span><ins>+ String suggestedFilename = toWTFString(filename);
+
</ins><span class="cx"> StringBuilder builder;
</span><span class="cx"> builder.append("Downloading URL with suggested filename \"");
</span><del>- builder.append(toWTFString(filename));
</del><ins>+ builder.append(suggestedFilename);
</ins><span class="cx"> builder.append("\"\n");
</span><span class="cx">
</span><span class="cx"> m_currentInvocation->outputText(builder.toString());
</span><span class="cx">
</span><del>- return nullptr;
</del><ins>+ const char* dumpRenderTreeTemp = libraryPathForTesting();
+ if (!dumpRenderTreeTemp)
+ return nullptr;
+
+ *allowOverwrite = true;
+ String temporaryFolder = String::fromUTF8(dumpRenderTreeTemp);
+ if (suggestedFilename.isEmpty())
+ suggestedFilename = "Unknown";
+
+ return toWK(temporaryFolder + "/" + suggestedFilename).leakRef();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::downloadDidFinish(WKContextRef, WKDownloadRef)
</span></span></pre>
</div>
</div>
</body>
</html>