<!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>[213374] branches/safari-603.1.30.0-branch</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/213374">213374</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-03-03 11:36:58 -0800 (Fri, 03 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213253">r213253</a>. rdar://problem/30773140</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6031300branchLayoutTestsChangeLog">branches/safari-603.1.30.0-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6031300branchLayoutTestsplatformiossimulatorwk1TestExpectations">branches/safari-603.1.30.0-branch/LayoutTests/platform/ios-simulator-wk1/TestExpectations</a></li>
<li><a href="#branchessafari6031300branchLayoutTestsplatformiossimulatorwk2TestExpectations">branches/safari-603.1.30.0-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations</a></li>
<li><a href="#branchessafari6031300branchLayoutTestsplatformmacwk1TestExpectations">branches/safari-603.1.30.0-branch/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#branchessafari6031300branchLayoutTestsplatformwinTestExpectations">branches/safari-603.1.30.0-branch/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#branchessafari6031300branchSourceWebCoreChangeLog">branches/safari-603.1.30.0-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6031300branchSourceWebCoreloaderPolicyCheckercpp">branches/safari-603.1.30.0-branch/Source/WebCore/loader/PolicyChecker.cpp</a></li>
<li><a href="#branchessafari6031300branchSourceWebKit2ChangeLog">branches/safari-603.1.30.0-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6031300branchSourceWebKit2UIProcessDownloadsDownloadProxycpp">branches/safari-603.1.30.0-branch/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6031300branchLayoutTestshttptestsdownloadanchordownloadnovalueexpectedtxt">branches/safari-603.1.30.0-branch/LayoutTests/http/tests/download/anchor-download-no-value-expected.txt</a></li>
<li><a href="#branchessafari6031300branchLayoutTestshttptestsdownloadanchordownloadnovaluehtml">branches/safari-603.1.30.0-branch/LayoutTests/http/tests/download/anchor-download-no-value.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6031300branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.0-branch/LayoutTests/ChangeLog (213373 => 213374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.0-branch/LayoutTests/ChangeLog 2017-03-03 18:59:51 UTC (rev 213373)
+++ branches/safari-603.1.30.0-branch/LayoutTests/ChangeLog 2017-03-03 19:36:58 UTC (rev 213374)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-03-03 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r213253. rdar://problem/30773140
+
+ 2017-03-01 Chris Dumez <cdumez@apple.com>
+
+ [WK2][!NETWORK_SESSION] Failure to download when using a download attribute with no value on an anchor
+ https://bugs.webkit.org/show_bug.cgi?id=169060
+ <rdar://problem/30773140>
+
+ Reviewed by Darin Adler.
+
+ Add layout test coverage.
+
+ * http/tests/download/anchor-download-no-value-expected.txt: Added.
+ * http/tests/download/anchor-download-no-value.html: Added.
+
</ins><span class="cx"> 2017-02-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r212972. rdar://problem/30704432
</span></span></pre></div>
<a id="branchessafari6031300branchLayoutTestshttptestsdownloadanchordownloadnovalueexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603.1.30.0-branch/LayoutTests/http/tests/download/anchor-download-no-value-expected.txt (0 => 213374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.0-branch/LayoutTests/http/tests/download/anchor-download-no-value-expected.txt (rev 0)
+++ branches/safari-603.1.30.0-branch/LayoutTests/http/tests/download/anchor-download-no-value-expected.txt 2017-03-03 19:36:58 UTC (rev 213374)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+Download started.
+Downloading URL with suggested filename "abe.png"
+Download completed.
+The suggested filename above should be "abe.png" and the download should succeed.
+
+Link with download attribute.
</ins></span></pre></div>
<a id="branchessafari6031300branchLayoutTestshttptestsdownloadanchordownloadnovaluehtml"></a>
<div class="addfile"><h4>Added: branches/safari-603.1.30.0-branch/LayoutTests/http/tests/download/anchor-download-no-value.html (0 => 213374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.0-branch/LayoutTests/http/tests/download/anchor-download-no-value.html (rev 0)
+++ branches/safari-603.1.30.0-branch/LayoutTests/http/tests/download/anchor-download-no-value.html 2017-03-03 19:36:58 UTC (rev 213374)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script type='text/javascript'>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+</script>
+</head>
+<body>
+<p>The suggested filename above should be "abe.png" and the download should succeed.</p>
+<a id="download-url" href="/css/resources/abe.png" download>Link with download attribute.</a>
+<script>
+function click(elmt)
+{
+ if (!window.eventSender) {
+ alert('Click the link to run the test.');
+ return;
+ }
+ eventSender.mouseMoveTo(elmt.offsetLeft + 5, elmt.offsetTop + 5);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+}
+
+function runTest()
+{
+ var link = document.getElementById("download-url");
+ click(link);
+}
+runTest();
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6031300branchLayoutTestsplatformiossimulatorwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.0-branch/LayoutTests/platform/ios-simulator-wk1/TestExpectations (213373 => 213374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.0-branch/LayoutTests/platform/ios-simulator-wk1/TestExpectations 2017-03-03 18:59:51 UTC (rev 213373)
+++ branches/safari-603.1.30.0-branch/LayoutTests/platform/ios-simulator-wk1/TestExpectations 2017-03-03 19:36:58 UTC (rev 213374)
</span><span class="lines">@@ -1347,6 +1347,7 @@
</span><span class="cx"> webkit.org/b/156069 http/tests/security/anchor-download-allow-data.html [ Skip ]
</span><span class="cx"> webkit.org/b/156069 http/tests/security/anchor-download-allow-sameorigin.html [ Skip ]
</span><span class="cx"> webkit.org/b/156069 http/tests/security/anchor-download-block-crossorigin.html [ Skip ]
</span><ins>+webkit.org/b/156069 http/tests/download/anchor-download-no-value.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # testRunner.setShouldDownloadUndisplayableMIMETypes() is not supported on WK1.
</span><span class="cx"> fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download.html [ Skip ]
</span></span></pre></div>
<a id="branchessafari6031300branchLayoutTestsplatformiossimulatorwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.0-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations (213373 => 213374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.0-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2017-03-03 18:59:51 UTC (rev 213373)
+++ branches/safari-603.1.30.0-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2017-03-03 19:36:58 UTC (rev 213374)
</span><span class="lines">@@ -1845,6 +1845,7 @@
</span><span class="cx"> webkit.org/b/156067 http/tests/security/anchor-download-allow-data.html [ Skip ]
</span><span class="cx"> webkit.org/b/156067 http/tests/security/anchor-download-allow-sameorigin.html [ Skip ]
</span><span class="cx"> webkit.org/b/156067 http/tests/security/anchor-download-block-crossorigin.html [ Skip ]
</span><ins>+webkit.org/b/156067 http/tests/download/anchor-download-no-value.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> webkit.org/b/149087 http/tests/cache/disk-cache/disk-cache-vary.html [ Pass Timeout ]
</span><span class="cx"> webkit.org/b/149087 http/tests/cache/disk-cache/disk-cache-vary-no-body.html [ Pass Timeout ]
</span></span></pre></div>
<a id="branchessafari6031300branchLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.0-branch/LayoutTests/platform/mac-wk1/TestExpectations (213373 => 213374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.0-branch/LayoutTests/platform/mac-wk1/TestExpectations 2017-03-03 18:59:51 UTC (rev 213373)
+++ branches/safari-603.1.30.0-branch/LayoutTests/platform/mac-wk1/TestExpectations 2017-03-03 19:36:58 UTC (rev 213374)
</span><span class="lines">@@ -217,6 +217,7 @@
</span><span class="cx"> webkit.org/b/156069 http/tests/security/anchor-download-allow-data.html [ Skip ]
</span><span class="cx"> webkit.org/b/156069 http/tests/security/anchor-download-allow-sameorigin.html [ Skip ]
</span><span class="cx"> webkit.org/b/156069 http/tests/security/anchor-download-block-crossorigin.html [ Skip ]
</span><ins>+webkit.org/b/156069 http/tests/download/anchor-download-no-value.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # testRunner.setShouldDownloadUndisplayableMIMETypes() is not supported on WK1.
</span><span class="cx"> fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download.html [ Skip ]
</span></span></pre></div>
<a id="branchessafari6031300branchLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.0-branch/LayoutTests/platform/win/TestExpectations (213373 => 213374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.0-branch/LayoutTests/platform/win/TestExpectations 2017-03-03 18:59:51 UTC (rev 213373)
+++ branches/safari-603.1.30.0-branch/LayoutTests/platform/win/TestExpectations 2017-03-03 19:36:58 UTC (rev 213374)
</span><span class="lines">@@ -454,6 +454,7 @@
</span><span class="cx"> http/tests/download/area-download.html [ Skip ]
</span><span class="cx"> http/tests/security/anchor-download-allow-data.html [ Skip ]
</span><span class="cx"> http/tests/security/anchor-download-allow-sameorigin.html [ Skip ]
</span><ins>+http/tests/download/anchor-download-no-value.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # testRunner.setShouldDownloadUndisplayableMIMETypes() is not supported on WK1.
</span><span class="cx"> fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download.html [ Skip ]
</span></span></pre></div>
<a id="branchessafari6031300branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.0-branch/Source/WebCore/ChangeLog (213373 => 213374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.0-branch/Source/WebCore/ChangeLog 2017-03-03 18:59:51 UTC (rev 213373)
+++ branches/safari-603.1.30.0-branch/Source/WebCore/ChangeLog 2017-03-03 19:36:58 UTC (rev 213374)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-03-03 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r213253. rdar://problem/30773140
+
+ 2017-03-01 Chris Dumez <cdumez@apple.com>
+
+ [WK2][!NETWORK_SESSION] Failure to download when using a download attribute with no value on an anchor
+ https://bugs.webkit.org/show_bug.cgi?id=169060
+ <rdar://problem/30773140>
+
+ Reviewed by Darin Adler.
+
+ Make sure we never set the suggested filename to the empty string when
+ the download attribute is present but has no value.
+
+ Test: http/tests/download/anchor-download-no-value.html
+
+ * loader/PolicyChecker.cpp:
+ (WebCore::PolicyChecker::checkNavigationPolicy):
+
</ins><span class="cx"> 2017-03-02 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout r212886. rdar://problem/30812601
</span></span></pre></div>
<a id="branchessafari6031300branchSourceWebCoreloaderPolicyCheckercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.0-branch/Source/WebCore/loader/PolicyChecker.cpp (213373 => 213374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.0-branch/Source/WebCore/loader/PolicyChecker.cpp 2017-03-03 18:59:51 UTC (rev 213373)
+++ branches/safari-603.1.30.0-branch/Source/WebCore/loader/PolicyChecker.cpp 2017-03-03 19:36:58 UTC (rev 213374)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_delegateIsDecidingNavigationPolicy = true;
</span><del>- m_suggestedFilename = action.downloadAttribute();
</del><ins>+ m_suggestedFilename = action.downloadAttribute().isEmpty() ? nullAtom : action.downloadAttribute();
</ins><span class="cx"> m_frame.loader().client().dispatchDecidePolicyForNavigationAction(action, request, formState, [this](PolicyAction action) {
</span><span class="cx"> continueAfterNavigationPolicy(action);
</span><span class="cx"> });
</span></span></pre></div>
<a id="branchessafari6031300branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.0-branch/Source/WebKit2/ChangeLog (213373 => 213374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.0-branch/Source/WebKit2/ChangeLog 2017-03-03 18:59:51 UTC (rev 213373)
+++ branches/safari-603.1.30.0-branch/Source/WebKit2/ChangeLog 2017-03-03 19:36:58 UTC (rev 213374)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-03-03 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r213253. rdar://problem/30773140
+
+ 2017-03-01 Chris Dumez <cdumez@apple.com>
+
+ [WK2][!NETWORK_SESSION] Failure to download when using a download attribute with no value on an anchor
+ https://bugs.webkit.org/show_bug.cgi?id=169060
+ <rdar://problem/30773140>
+
+ Reviewed by Darin Adler.
+
+ In the !NETWORK_SESSION code path, we were failing to use the suggested filename coming from the
+ network layer in the case where the download attribute is present but has no value. We were ending
+ up passing an empty string as suggested filename to Safari which is not handled properly.
+
+ * UIProcess/Downloads/DownloadProxy.cpp:
+ (WebKit::DownloadProxy::decideDestinationWithSuggestedFilename):
+
</ins><span class="cx"> 2017-02-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r213010. rdar://problem/30704432
</span></span></pre></div>
<a id="branchessafari6031300branchSourceWebKit2UIProcessDownloadsDownloadProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603.1.30.0-branch/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp (213373 => 213374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603.1.30.0-branch/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2017-03-03 18:59:51 UTC (rev 213373)
+++ branches/safari-603.1.30.0-branch/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2017-03-03 19:36:58 UTC (rev 213374)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> String suggestedFilename = filename;
</span><del>- if (!m_suggestedFilename.isNull())
</del><ins>+ if (!m_suggestedFilename.isEmpty())
</ins><span class="cx"> suggestedFilename = m_suggestedFilename;
</span><span class="cx">
</span><span class="cx"> destination = m_processPool->downloadClient().decideDestinationWithSuggestedFilename(m_processPool.get(), this, suggestedFilename, allowOverwrite);
</span></span></pre>
</div>
</div>
</body>
</html>