<!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>[208513] 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/208513">208513</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-11-09 17:21:56 -0800 (Wed, 09 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/208438">r208438</a>.
crashes
Reverted changeset:
"[WK2][NETWORK_SESSION] Add support for downloading file
backed blobs"
https://bugs.webkit.org/show_bug.cgi?id=164458
http://trac.webkit.org/changeset/208438</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk1TestExpectations">trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk2TestExpectations">trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobResourceHandlecpp">trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp</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="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkDataTaskcpp">trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkDataTaskh">trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkDataTaskBlobcpp">trunk/Source/WebKit2/NetworkProcess/NetworkDataTaskBlob.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkDataTaskBlobh">trunk/Source/WebKit2/NetworkProcess/NetworkDataTaskBlob.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadcpp">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadParametersh">trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessPingLoadh">trunk/Source/WebKit2/NetworkProcess/PingLoad.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllerh">trunk/Tools/WebKitTestRunner/TestController.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestInvocationcpp">trunk/Tools/WebKitTestRunner/TestInvocation.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomHTMLAnchorElementanchorfileblobconverttodownloadexpectedtxt">trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLAnchorElementanchorfileblobconverttodownloadhtml">trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download.html</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLAnchorElementanchorfileblobdownloadexpectedtxt">trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-download-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLAnchorElementanchorfileblobdownloadhtml">trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-download.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/LayoutTests/ChangeLog 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-09 Alex Christensen <achristensen@webkit.org>
+
+ Unreviewed, rolling out r208438.
+
+ crashes
+
+ Reverted changeset:
+
+ "[WK2][NETWORK_SESSION] Add support for downloading file
+ backed blobs"
+ https://bugs.webkit.org/show_bug.cgi?id=164458
+ http://trac.webkit.org/changeset/208438
+
</ins><span class="cx"> 2016-11-09 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking two media/modern-media-controls tests as flaky.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLAnchorElementanchorfileblobconverttodownloadexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download-expected.txt (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download-expected.txt 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download-expected.txt 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-Download started.
-Downloading URL with suggested filename "unknown"
-Download completed.
-The download should succeed.
-
-File backed blob URL
</del></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLAnchorElementanchorfileblobconverttodownloadhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download.html (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download.html 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download.html 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script type='text/javascript'>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- testRunner.setShouldDownloadUndisplayableMIMETypes(true);
-}
-</script>
-</head>
-<body>
-<p>The download should succeed.</p>
-<a id="blob-url">File backed blob URL</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()
-{
- file = internals.createFile("../../../resources/Ahem.otf");
- var link = document.getElementById("blob-url");
- link.href = window.URL.createObjectURL(file);
- click(link);
-}
-runTest();
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLAnchorElementanchorfileblobdownloadexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-download-expected.txt (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-download-expected.txt 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-download-expected.txt 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-Download started.
-Downloading URL with suggested filename "abe.png"
-Download completed.
-The suggested filename above should be "abe.png" and the download should succeed.
-
-File backed blob URL
</del></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLAnchorElementanchorfileblobdownloadhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-download.html (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-download.html 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-file-blob-download.html 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-<!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="blob-url" download="abe.png">File backed blob URL</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()
-{
- file = internals.createFile("../resources/abe.png");
- var link = document.getElementById("blob-url");
- link.href = window.URL.createObjectURL(file);
- click(link);
-}
-runTest();
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -1332,7 +1332,6 @@
</span><span class="cx"> # <a download> is not supported in WK1 yet.
</span><span class="cx"> webkit.org/b/156069 fast/dom/HTMLAnchorElement/anchor-download-synthetic-click.html [ Skip ]
</span><span class="cx"> webkit.org/b/156069 fast/dom/HTMLAnchorElement/anchor-download-user-triggered-synthetic-click.html [ Skip ]
</span><del>-webkit.org/b/156069 fast/dom/HTMLAnchorElement/anchor-file-blob-download.html [ Skip ]
</del><span class="cx"> webkit.org/b/156069 http/tests/download/area-download.html [ Skip ]
</span><span class="cx"> webkit.org/b/156069 http/tests/security/anchor-download-allow-blob.html [ Skip ]
</span><span class="cx"> webkit.org/b/156069 http/tests/security/anchor-download-allow-data.html [ Skip ]
</span><span class="lines">@@ -1339,9 +1338,6 @@
</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><span class="cx">
</span><del>-# testRunner.setShouldDownloadUndisplayableMIMETypes() is not supported on WK1.
-fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download.html [ Skip ]
-
</del><span class="cx"> webkit.org/b/137572 scrollbars/scrollbar-iframe-click-does-not-blur-content.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> # This test relies on a settings option that we can only set with WKRT.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -1815,8 +1815,6 @@
</span><span class="cx"> # <a download> does not work on iOS.
</span><span class="cx"> webkit.org/b/156067 fast/dom/HTMLAnchorElement/anchor-download-unset.html [ Skip ]
</span><span class="cx"> webkit.org/b/156067 fast/dom/HTMLAnchorElement/anchor-download.html [ Skip ]
</span><del>-webkit.org/b/156067 fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download.html [ Skip ]
-webkit.org/b/156067 fast/dom/HTMLAnchorElement/anchor-file-blob-download.html [ Skip ]
</del><span class="cx"> webkit.org/b/156067 fast/dom/HTMLAnchorElement/anchor-nodownload-set.html [ Skip ]
</span><span class="cx"> webkit.org/b/156067 fast/dom/HTMLAnchorElement/anchor-nodownload.html [ Skip ]
</span><span class="cx"> webkit.org/b/156067 fast/dom/HTMLAnchorElement/anchor-download-synthetic-click.html [ Skip ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -197,7 +197,6 @@
</span><span class="cx"> webkit.org/b/156069 fast/dom/HTMLAnchorElement/anchor-download.html [ Failure ]
</span><span class="cx"> webkit.org/b/156069 fast/dom/HTMLAnchorElement/anchor-download-synthetic-click.html [ Skip ]
</span><span class="cx"> webkit.org/b/156069 fast/dom/HTMLAnchorElement/anchor-download-user-triggered-synthetic-click.html [ Skip ]
</span><del>-webkit.org/b/156069 fast/dom/HTMLAnchorElement/anchor-file-blob-download.html [ Skip ]
</del><span class="cx"> webkit.org/b/156069 http/tests/download/area-download.html [ Skip ]
</span><span class="cx"> webkit.org/b/156069 http/tests/security/anchor-download-allow-blob.html [ Skip ]
</span><span class="cx"> webkit.org/b/156069 http/tests/security/anchor-download-allow-data.html [ Skip ]
</span><span class="lines">@@ -204,9 +203,6 @@
</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><span class="cx">
</span><del>-# testRunner.setShouldDownloadUndisplayableMIMETypes() is not supported on WK1.
-fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download.html [ Skip ]
-
</del><span class="cx"> webkit.org/b/156629 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute.html [ Pass Failure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/157007 fast/layers/no-clipping-overflow-hidden-added-after-transform.html [ Pass ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2016-11-10 01:21:56 UTC (rev 208513)
</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="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/LayoutTests/platform/win/TestExpectations 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -447,14 +447,10 @@
</span><span class="cx"> fast/dom/HTMLAnchorElement/anchor-download-unset.html [ Skip ]
</span><span class="cx"> fast/dom/HTMLAnchorElement/anchor-download-synthetic-click.html [ Skip ]
</span><span class="cx"> fast/dom/HTMLAnchorElement/anchor-download-user-triggered-synthetic-click.html [ Skip ]
</span><del>-fast/dom/HTMLAnchorElement/anchor-file-blob-download.html [ Skip ]
</del><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><span class="cx">
</span><del>-# testRunner.setShouldDownloadUndisplayableMIMETypes() is not supported on WK1.
-fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download.html [ Skip ]
-
</del><span class="cx"> # TODO Expose title direction in WebKit API (Chromium Only)
</span><span class="cx"> webkit.org/b/58845 fast/dom/title-directionality.html [ Skip ]
</span><span class="cx"> webkit.org/b/58845 fast/dom/title-directionality-removeChild.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebCore/ChangeLog 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-09 Alex Christensen <achristensen@webkit.org>
+
+ Unreviewed, rolling out r208438.
+
+ crashes
+
+ Reverted changeset:
+
+ "[WK2][NETWORK_SESSION] Add support for downloading file
+ backed blobs"
+ https://bugs.webkit.org/show_bug.cgi?id=164458
+ http://trac.webkit.org/changeset/208438
+
</ins><span class="cx"> 2016-11-09 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Change the decoding for some animated images to be asynchronous
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -150,7 +150,6 @@
</span><span class="cx"> void BlobResourceHandle::cancel()
</span><span class="cx"> {
</span><span class="cx"> m_asyncStream = nullptr;
</span><del>- m_fileOpened = false;
</del><span class="cx">
</span><span class="cx"> m_aborted = true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-09 Alex Christensen <achristensen@webkit.org>
+
+ Unreviewed, rolling out r208438.
+
+ crashes
+
+ Reverted changeset:
+
+ "[WK2][NETWORK_SESSION] Add support for downloading file
+ backed blobs"
+ https://bugs.webkit.org/show_bug.cgi?id=164458
+ http://trac.webkit.org/changeset/208438
+
</ins><span class="cx"> 2016-11-04 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Local HTML should be blocked from localStorage access unless "Disable Local File Restrictions" is checked
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "DownloadManager.h"
</span><span class="cx">
</span><span class="cx"> #include "Download.h"
</span><del>-#include "NetworkBlobRegistry.h"
</del><span class="cx"> #include "NetworkLoad.h"
</span><span class="cx"> #include "NetworkSession.h"
</span><span class="cx"> #include "PendingDownload.h"
</span><span class="lines">@@ -45,20 +44,16 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DownloadManager::startDownload(NetworkConnectionToWebProcess* connection, SessionID sessionID, DownloadID downloadID, const ResourceRequest& request, const String& suggestedName)
</del><ins>+void DownloadManager::startDownload(SessionID sessionID, DownloadID downloadID, const ResourceRequest& request, const String& suggestedName)
</ins><span class="cx"> {
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> auto* networkSession = SessionTracker::networkSession(sessionID);
</span><span class="cx"> if (!networkSession)
</span><span class="cx"> return;
</span><del>-
</del><span class="cx"> NetworkLoadParameters parameters;
</span><span class="cx"> parameters.sessionID = sessionID;
</span><span class="cx"> parameters.request = request;
</span><span class="cx"> parameters.clientCredentialPolicy = ClientCredentialPolicy::MayAskClientForCredentials;
</span><del>- if (request.url().protocolIsBlob() && connection)
- parameters.blobFileReferences = NetworkBlobRegistry::singleton().filesInBlob(*connection, parameters.request.url());
-
</del><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></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx">
</span><span class="cx"> class AuthenticationManager;
</span><span class="cx"> class Download;
</span><del>-class NetworkConnectionToWebProcess;
</del><span class="cx"> class PendingDownload;
</span><span class="cx">
</span><span class="cx"> class DownloadManager {
</span><span class="lines">@@ -73,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> explicit DownloadManager(Client&);
</span><span class="cx">
</span><del>- void startDownload(NetworkConnectionToWebProcess*, WebCore::SessionID, DownloadID, const WebCore::ResourceRequest&, const String& suggestedName = { });
</del><ins>+ void startDownload(WebCore::SessionID, DownloadID, const WebCore::ResourceRequest&, const String& suggestedName = { });
</ins><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> void dataTaskBecameDownloadTask(DownloadID, std::unique_ptr<Download>&&);
</span><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkConnectionToWebProcess::startDownload(SessionID sessionID, DownloadID downloadID, const ResourceRequest& request, const String& suggestedName)
</span><span class="cx"> {
</span><del>- NetworkProcess::singleton().downloadManager().startDownload(this, sessionID, downloadID, request, suggestedName);
</del><ins>+ NetworkProcess::singleton().downloadManager().startDownload(sessionID, downloadID, request, suggestedName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkConnectionToWebProcess::convertMainResourceLoadToDownload(SessionID sessionID, uint64_t mainResourceLoadIdentifier, DownloadID downloadID, const ResourceRequest& request, const ResourceResponse& response)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto& networkProcess = NetworkProcess::singleton();
</span><span class="cx"> if (!mainResourceLoadIdentifier) {
</span><del>- networkProcess.downloadManager().startDownload(this, sessionID, downloadID, request);
</del><ins>+ networkProcess.downloadManager().startDownload(sessionID, downloadID, request);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkDataTaskcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx">
</span><span class="cx"> #include "NetworkDataTaskBlob.h"
</span><del>-#include "NetworkLoadParameters.h"
</del><span class="cx"> #include "NetworkSession.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="lines">@@ -44,16 +43,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-Ref<NetworkDataTask> NetworkDataTask::create(NetworkSession& session, NetworkDataTaskClient& client, const NetworkLoadParameters& parameters)
</del><ins>+Ref<NetworkDataTask> NetworkDataTask::create(NetworkSession& session, NetworkDataTaskClient& client, const ResourceRequest& request, StoredCredentials storedCredentials, ContentSniffingPolicy shouldContentSniff, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
</ins><span class="cx"> {
</span><del>- if (parameters.request.url().protocolIsBlob())
- return NetworkDataTaskBlob::create(session, client, parameters.request, parameters.contentSniffingPolicy, parameters.blobFileReferences);
</del><ins>+ if (request.url().protocolIsBlob())
+ return NetworkDataTaskBlob::create(session, client, request, shouldContentSniff);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- return NetworkDataTaskCocoa::create(session, client, parameters.request, parameters.allowStoredCredentials, parameters.contentSniffingPolicy, parameters.shouldClearReferrerOnHTTPSToHTTPRedirect);
</del><ins>+ return NetworkDataTaskCocoa::create(session, client, request, storedCredentials, shouldContentSniff, shouldClearReferrerOnHTTPSToHTTPRedirect);
</ins><span class="cx"> #endif
</span><span class="cx"> #if USE(SOUP)
</span><del>- return NetworkDataTaskSoup::create(session, client, parameters.request, parameters.allowStoredCredentials, parameters.contentSniffingPolicy, parameters.shouldClearReferrerOnHTTPSToHTTPRedirect);
</del><ins>+ return NetworkDataTaskSoup::create(session, client, request, storedCredentials, shouldContentSniff, shouldClearReferrerOnHTTPSToHTTPRedirect);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkDataTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class Download;
</span><del>-class NetworkLoadParameters;
</del><span class="cx"> class NetworkSession;
</span><span class="cx"> class PendingDownload;
</span><span class="cx"> enum class AuthenticationChallengeDisposition;
</span><span class="lines">@@ -74,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> class NetworkDataTask : public RefCounted<NetworkDataTask> {
</span><span class="cx"> public:
</span><del>- static Ref<NetworkDataTask> create(NetworkSession&, NetworkDataTaskClient&, const NetworkLoadParameters&);
</del><ins>+ static Ref<NetworkDataTask> create(NetworkSession&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, WebCore::StoredCredentials, WebCore::ContentSniffingPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect);
</ins><span class="cx">
</span><span class="cx"> virtual ~NetworkDataTask();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkDataTaskBlobcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTaskBlob.cpp (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTaskBlob.cpp 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTaskBlob.cpp 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -73,16 +73,11 @@
</span><span class="cx">
</span><span class="cx"> static const char* const webKitBlobResourceDomain = "WebKitBlobResource";
</span><span class="cx">
</span><del>-NetworkDataTaskBlob::NetworkDataTaskBlob(NetworkSession& session, NetworkDataTaskClient& client, const ResourceRequest& request, ContentSniffingPolicy shouldContentSniff, const Vector<RefPtr<WebCore::BlobDataFileReference>>& fileReferences)
</del><ins>+NetworkDataTaskBlob::NetworkDataTaskBlob(NetworkSession& session, NetworkDataTaskClient& client, const ResourceRequest& request, ContentSniffingPolicy shouldContentSniff)
</ins><span class="cx"> : NetworkDataTask(session, client, request, DoNotAllowStoredCredentials, false)
</span><ins>+ , m_blobData(static_cast<BlobRegistryImpl&>(blobRegistry()).getBlobDataFromURL(request.url()))
</ins><span class="cx"> , m_stream(std::make_unique<AsyncFileStream>(*this))
</span><del>- , m_fileReferences(fileReferences)
</del><span class="cx"> {
</span><del>- for (auto& fileReference : m_fileReferences)
- fileReference->prepareForFileAccess();
-
- m_blobData = static_cast<BlobRegistryImpl&>(blobRegistry()).getBlobDataFromURL(request.url());
-
</del><span class="cx"> m_session->registerNetworkDataTask(*this);
</span><span class="cx"> LOG(NetworkSession, "%p - Created NetworkDataTaskBlob for %s", this, request.url().string().utf8().data());
</span><span class="cx"> }
</span><span class="lines">@@ -89,9 +84,6 @@
</span><span class="cx">
</span><span class="cx"> NetworkDataTaskBlob::~NetworkDataTaskBlob()
</span><span class="cx"> {
</span><del>- for (auto& fileReference : m_fileReferences)
- fileReference->revokeFileAccess();
-
</del><span class="cx"> clearStream();
</span><span class="cx"> m_session->unregisterNetworkDataTask(*this);
</span><span class="cx"> }
</span><span class="lines">@@ -480,8 +472,8 @@
</span><span class="cx"> downloadManager.dataTaskBecameDownloadTask(m_pendingDownloadID, WTFMove(download));
</span><span class="cx"> downloadPtr->didCreateDestination(m_pendingDownloadLocation);
</span><span class="cx">
</span><del>- if (m_client)
- m_client->didBecomeDownload();
</del><ins>+ ASSERT(m_client);
+ m_client->didBecomeDownload();
</ins><span class="cx">
</span><span class="cx"> m_buffer.resize(bufferSize);
</span><span class="cx"> read();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkDataTaskBlobh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTaskBlob.h (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTaskBlob.h 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTaskBlob.h 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class AsyncFileStream;
</span><del>-class BlobDataFileReference;
</del><span class="cx"> class BlobData;
</span><span class="cx"> class BlobDataItem;
</span><span class="cx"> }
</span><span class="lines">@@ -48,15 +47,15 @@
</span><span class="cx">
</span><span class="cx"> class NetworkDataTaskBlob final : public NetworkDataTask, public WebCore::FileStreamClient {
</span><span class="cx"> public:
</span><del>- static Ref<NetworkDataTask> create(NetworkSession& session, NetworkDataTaskClient& client, const WebCore::ResourceRequest& request, WebCore::ContentSniffingPolicy shouldContentSniff, const Vector<RefPtr<WebCore::BlobDataFileReference>>& fileReferences)
</del><ins>+ static Ref<NetworkDataTask> create(NetworkSession& session, NetworkDataTaskClient& client, const WebCore::ResourceRequest& request, WebCore::ContentSniffingPolicy shouldContentSniff)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new NetworkDataTaskBlob(session, client, request, shouldContentSniff, fileReferences));
</del><ins>+ return adoptRef(*new NetworkDataTaskBlob(session, client, request, shouldContentSniff));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~NetworkDataTaskBlob();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- NetworkDataTaskBlob(NetworkSession&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, WebCore::ContentSniffingPolicy, const Vector<RefPtr<WebCore::BlobDataFileReference>>&);
</del><ins>+ NetworkDataTaskBlob(NetworkSession&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, WebCore::ContentSniffingPolicy);
</ins><span class="cx">
</span><span class="cx"> void suspend() override;
</span><span class="cx"> void cancel() override;
</span><span class="lines">@@ -114,8 +113,6 @@
</span><span class="cx"> unsigned m_readItemCount { 0 };
</span><span class="cx"> bool m_fileOpened { false };
</span><span class="cx"> WebCore::PlatformFileHandle m_downloadFile { WebCore::invalidPlatformFileHandle };
</span><del>-
- Vector<RefPtr<WebCore::BlobDataFileReference>> m_fileReferences;
</del><span class="cx"> RefPtr<SandboxExtension> m_sandboxExtension;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> , m_parameters(WTFMove(parameters))
</span><span class="cx"> , m_currentRequest(m_parameters.request)
</span><span class="cx"> {
</span><del>- m_task = NetworkDataTask::create(networkSession, *this, m_parameters);
</del><ins>+ m_task = NetworkDataTask::create(networkSession, *this, m_parameters.request, m_parameters.allowStoredCredentials, m_parameters.contentSniffingPolicy, m_parameters.shouldClearReferrerOnHTTPSToHTTPRedirect);
</ins><span class="cx"> if (!m_parameters.defersLoading)
</span><span class="cx"> m_task->resume();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.h (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.h 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.h 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #ifndef NetworkLoadParameters_h
</span><span class="cx"> #define NetworkLoadParameters_h
</span><span class="cx">
</span><del>-#include <WebCore/BlobDataFileReference.h>
</del><span class="cx"> #include <WebCore/ResourceLoaderOptions.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="lines">@@ -46,9 +45,6 @@
</span><span class="cx"> bool shouldClearReferrerOnHTTPSToHTTPRedirect { true };
</span><span class="cx"> bool defersLoading { false };
</span><span class="cx"> bool needsCertificateInfo { false };
</span><del>-#if USE(NETWORK_SESSION)
- Vector<RefPtr<WebCore::BlobDataFileReference>> blobFileReferences;
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -466,7 +466,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::downloadRequest(SessionID sessionID, DownloadID downloadID, const ResourceRequest& request, const String& suggestedFilename)
</span><span class="cx"> {
</span><del>- downloadManager().startDownload(nullptr, sessionID, downloadID, request, suggestedFilename);
</del><ins>+ downloadManager().startDownload(sessionID, downloadID, request, suggestedFilename);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::resumeDownload(SessionID sessionID, DownloadID downloadID, const IPC::DataReference& resumeData, const String& path, const WebKit::SandboxExtension::Handle& sandboxExtensionHandle)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -98,14 +98,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !USE(NETWORK_SESSION)
</del><span class="cx"> if (originalRequest().url().protocolIsBlob()) {
</span><span class="cx"> ASSERT(!m_parameters.resourceSandboxExtension);
</span><span class="cx"> m_fileReferences.appendVector(NetworkBlobRegistry::singleton().filesInBlob(connection, originalRequest().url()));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><del>-
</del><span class="cx"> if (synchronousReply)
</span><span class="cx"> m_synchronousLoadData = std::make_unique<SynchronousLoadData>(WTFMove(synchronousReply));
</span><span class="cx"> }
</span><span class="lines">@@ -222,9 +219,6 @@
</span><span class="cx"> parameters.request = request;
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- if (request.url().protocolIsBlob())
- parameters.blobFileReferences = NetworkBlobRegistry::singleton().filesInBlob(m_connection, originalRequest().url());
-
</del><span class="cx"> auto* networkSession = SessionTracker::networkSession(parameters.sessionID);
</span><span class="cx"> if (!networkSession) {
</span><span class="cx"> WTFLogAlways("Attempted to create a NetworkLoad with a session (id=%" PRIu64 ") that does not exist.", parameters.sessionID.sessionID());
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessPingLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/PingLoad.h (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/PingLoad.h 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Source/WebKit2/NetworkProcess/PingLoad.h 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> , m_shouldFollowRedirects(parameters.shouldFollowRedirects)
</span><span class="cx"> {
</span><span class="cx"> if (auto* networkSession = SessionTracker::networkSession(parameters.sessionID)) {
</span><del>- m_task = NetworkDataTask::create(*networkSession, *this, parameters);
</del><ins>+ m_task = NetworkDataTask::create(*networkSession, *this, parameters.request, parameters.allowStoredCredentials, parameters.contentSniffingPolicy, parameters.shouldClearReferrerOnHTTPSToHTTPRedirect);
</ins><span class="cx"> m_task->resume();
</span><span class="cx"> } else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Tools/ChangeLog 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-09 Alex Christensen <achristensen@webkit.org>
+
+ Unreviewed, rolling out r208438.
+
+ crashes
+
+ Reverted changeset:
+
+ "[WK2][NETWORK_SESSION] Add support for downloading file
+ backed blobs"
+ https://bugs.webkit.org/show_bug.cgi?id=164458
+ http://trac.webkit.org/changeset/208438
+
</ins><span class="cx"> 2016-11-04 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Local HTML should be blocked from localStorage access unless "Disable Local File Restrictions" is checked
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -82,7 +82,6 @@
</span><span class="cx"> void setShouldDecideNavigationPolicyAfterDelay(boolean value);
</span><span class="cx"> void setNavigationGesturesEnabled(boolean value);
</span><span class="cx"> void setIgnoresViewportScaleLimits(boolean value);
</span><del>- void setShouldDownloadUndisplayableMIMETypes(boolean value);
</del><span class="cx">
</span><span class="cx"> // Special DOM functions.
</span><span class="cx"> void clearBackForwardList();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -1028,13 +1028,6 @@
</span><span class="cx"> WKBundlePagePostMessage(InjectedBundle::singleton().page()->page(), messageName.get(), messageBody.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::setShouldDownloadUndisplayableMIMETypes(bool value)
-{
- WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetShouldDownloadUndisplayableMIMETypes"));
- WKRetainPtr<WKBooleanRef> messageBody(AdoptWK, WKBooleanCreate(value));
- WKBundlePagePostMessage(InjectedBundle::singleton().page()->page(), messageName.get(), messageBody.get());
-}
-
</del><span class="cx"> static unsigned nextUIScriptCallbackID()
</span><span class="cx"> {
</span><span class="cx"> static unsigned callbackID = FirstUIScriptCallbackID;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -312,7 +312,6 @@
</span><span class="cx"> void setShouldDecideNavigationPolicyAfterDelay(bool);
</span><span class="cx"> void setNavigationGesturesEnabled(bool);
</span><span class="cx"> void setIgnoresViewportScaleLimits(bool);
</span><del>- void setShouldDownloadUndisplayableMIMETypes(bool);
</del><span class="cx">
</span><span class="cx"> void runUIScript(JSStringRef script, JSValueRef callback);
</span><span class="cx"> void runUIScriptCallback(unsigned callbackID, JSStringRef result);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -2061,10 +2061,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_shouldDownloadUndisplayableMIMETypes)
- WKFramePolicyListenerDownload(listener);
- else
- WKFramePolicyListenerIgnore(listener);
</del><ins>+ WKFramePolicyListenerIgnore(listener);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::didNavigateWithNavigationData(WKContextRef, WKPageRef, WKNavigationDataRef navigationData, WKFrameRef frame, const void* clientInfo)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.h (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.h 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Tools/WebKitTestRunner/TestController.h 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -142,8 +142,6 @@
</span><span class="cx"> void setNavigationGesturesEnabled(bool value);
</span><span class="cx"> void setIgnoresViewportScaleLimits(bool);
</span><span class="cx">
</span><del>- void setShouldDownloadUndisplayableMIMETypes(bool value) { m_shouldDownloadUndisplayableMIMETypes = value; }
-
</del><span class="cx"> private:
</span><span class="cx"> WKRetainPtr<WKPageConfigurationRef> generatePageConfiguration(WKContextConfigurationRef);
</span><span class="cx"> WKRetainPtr<WKContextConfigurationRef> generateContextConfiguration() const;
</span><span class="lines">@@ -326,7 +324,6 @@
</span><span class="cx">
</span><span class="cx"> bool m_policyDelegateEnabled { false };
</span><span class="cx"> bool m_policyDelegatePermissive { false };
</span><del>- bool m_shouldDownloadUndisplayableMIMETypes { false };
</del><span class="cx">
</span><span class="cx"> bool m_rejectsProtectionSpaceAndContinueForAuthenticationChallenges { false };
</span><span class="cx"> bool m_handlesAuthenticationChallenges { false };
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestInvocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (208512 => 208513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2016-11-10 01:16:20 UTC (rev 208512)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2016-11-10 01:21:56 UTC (rev 208513)
</span><span class="lines">@@ -687,13 +687,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (WKStringIsEqualToUTF8CString(messageName, "SetShouldDownloadUndisplayableMIMETypes")) {
- ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
- WKBooleanRef value = static_cast<WKBooleanRef>(messageBody);
- TestController::singleton().setShouldDownloadUndisplayableMIMETypes(WKBooleanGetValue(value));
- return;
- }
-
</del><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "RunUIProcessScript")) {
</span><span class="cx"> WKDictionaryRef messageBodyDictionary = static_cast<WKDictionaryRef>(messageBody);
</span><span class="cx"> WKRetainPtr<WKStringRef> scriptKey(AdoptWK, WKStringCreateWithUTF8CString("Script"));
</span></span></pre>
</div>
</div>
</body>
</html>