<!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>[207205] branches/safari-602-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/207205">207205</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-12 01:41:31 -0700 (Wed, 12 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205190">r205190</a>. rdar://problem/28545010</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchLayoutTestsfastfilesapplybloburltoxhrexpectedtxt">branches/safari-602-branch/LayoutTests/fast/files/apply-blob-url-to-xhr-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsfastfilesworkersworkerapplybloburltoxhrexpectedtxt">branches/safari-602-branch/LayoutTests/fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsimportedw3cChangeLog">branches/safari-602-branch/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#branchessafari602branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobexpectedtxt">branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobworkerexpectedtxt">branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobworkerhtml">branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker.html</a></li>
<li><a href="#branchessafari602branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobhtml">branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.html</a></li>
<li><a href="#branchessafari602branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobjs">branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.js</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCorefileapiFileReaderLoadercpp">branches/safari-602-branch/Source/WebCore/fileapi/FileReaderLoader.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorefileapiFileReaderLoaderh">branches/safari-602-branch/Source/WebCore/fileapi/FileReaderLoader.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformnetworkBlobResourceHandlecpp">branches/safari-602-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformnetworkBlobResourceHandleh">branches/safari-602-branch/Source/WebCore/platform/network/BlobResourceHandle.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (207204 => 207205)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-12 08:41:25 UTC (rev 207204)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-12 08:41:31 UTC (rev 207205)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r205190. rdar://problem/28545010
+
+ 2016-08-30 Youenn Fablet <youenn@apple.com>
+
+ [Fetch API] Blob not found URL should result in a network error
+ https://bugs.webkit.org/show_bug.cgi?id=161381
+
+ Reviewed by Sam Weinig.
+
+ * fast/files/apply-blob-url-to-xhr-expected.txt:
+ * fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt:
+
+2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r204266. rdar://problem/28216261
</span><span class="cx">
</span><span class="cx"> 2016-08-08 John Wilander <wilander@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsfastfilesapplybloburltoxhrexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/fast/files/apply-blob-url-to-xhr-expected.txt (207204 => 207205)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/files/apply-blob-url-to-xhr-expected.txt 2016-10-12 08:41:25 UTC (rev 207204)
+++ branches/safari-602-branch/LayoutTests/fast/files/apply-blob-url-to-xhr-expected.txt 2016-10-12 08:41:31 UTC (rev 207205)
</span><span class="lines">@@ -5,7 +5,6 @@
</span><span class="cx"> Test that XMLHttpRequest POST fails.
</span><span class="cx"> Received exception 19: NetworkError
</span><span class="cx"> Test that XMLHttpRequest GET fails after the blob URL is revoked.
</span><del>-Status: 404
-Response:
</del><ins>+Received exception 19: NetworkError
</ins><span class="cx"> DONE
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsfastfilesworkersworkerapplybloburltoxhrexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt (207204 => 207205)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt 2016-10-12 08:41:25 UTC (rev 207204)
+++ branches/safari-602-branch/LayoutTests/fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt 2016-10-12 08:41:31 UTC (rev 207205)
</span><span class="lines">@@ -5,7 +5,6 @@
</span><span class="cx"> Test that XMLHttpRequest POST fails.
</span><span class="cx"> Received exception 19: NetworkError
</span><span class="cx"> Test that XMLHttpRequest GET fails after the blob URL is revoked.
</span><del>-Status: 404
-Response:
</del><ins>+Received exception 19: NetworkError
</ins><span class="cx"> DONE
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/imported/w3c/ChangeLog (207204 => 207205)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/imported/w3c/ChangeLog 2016-10-12 08:41:25 UTC (rev 207204)
+++ branches/safari-602-branch/LayoutTests/imported/w3c/ChangeLog 2016-10-12 08:41:31 UTC (rev 207205)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r205190. rdar://problem/28545010
+
+ 2016-08-30 Youenn Fablet <youenn@apple.com>
+
+ [Fetch API] Blob not found URL should result in a network error
+ https://bugs.webkit.org/show_bug.cgi?id=161381
+
+ Reviewed by Sam Weinig.
+
+ * web-platform-tests/fetch/api/basic/scheme-blob-expected.txt:
+ * web-platform-tests/fetch/api/basic/scheme-blob-worker-expected.txt:
+ * web-platform-tests/fetch/api/basic/scheme-blob-worker.html:
+ * web-platform-tests/fetch/api/basic/scheme-blob.html:
+ * web-platform-tests/fetch/api/basic/scheme-blob.js:
+ (invalidRequestMethods.forEach):
+
</ins><span class="cx"> 2016-07-18 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] ReadableStream should throw a RangeError in case of NaN highWaterMark
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt (207204 => 207205)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt 2016-10-12 08:41:25 UTC (rev 207204)
+++ branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt 2016-10-12 08:41:31 UTC (rev 207205)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx">
</span><span class="cx"> PASS Fetching [GET] URL.createObjectURL(blob) is OK
</span><del>-PASS Fetching [GET] blob:http://www.localhost:8800/ is KO
</del><ins>+PASS Fetching [GET] not found blob URL is KO
</ins><span class="cx"> PASS Fetching [POST] URL.createObjectURL(blob) is KO
</span><span class="cx"> PASS Fetching [OPTIONS] URL.createObjectURL(blob) is KO
</span><span class="cx"> PASS Fetching [HEAD] URL.createObjectURL(blob) is KO
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobworkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker-expected.txt (207204 => 207205)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker-expected.txt 2016-10-12 08:41:25 UTC (rev 207204)
+++ branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker-expected.txt 2016-10-12 08:41:31 UTC (rev 207205)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx">
</span><span class="cx"> PASS Fetching [GET] URL.createObjectURL(blob) is OK
</span><del>-PASS Fetching [GET] blob:http://www.localhost:8800/ is KO
</del><ins>+PASS Fetching [GET] not found blob URL is KO
</ins><span class="cx"> PASS Fetching [POST] URL.createObjectURL(blob) is KO
</span><span class="cx"> PASS Fetching [OPTIONS] URL.createObjectURL(blob) is KO
</span><span class="cx"> PASS Fetching [HEAD] URL.createObjectURL(blob) is KO
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobworkerhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker.html (207204 => 207205)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker.html 2016-10-12 08:41:25 UTC (rev 207204)
+++ branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker.html 2016-10-12 08:41:31 UTC (rev 207205)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <script>
</span><del>- fetch_tests_from_worker(new Worker("scheme-blob.js?pipe=sub"));
</del><ins>+ fetch_tests_from_worker(new Worker("scheme-blob.js"));
</ins><span class="cx"> </script>
</span><span class="cx"> </body>
</span><del>-</html>
</del><span class="cx">\ No newline at end of file
</span><ins>+</html>
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.html (207204 => 207205)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.html 2016-10-12 08:41:25 UTC (rev 207204)
+++ branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.html 2016-10-12 08:41:31 UTC (rev 207205)
</span><span class="lines">@@ -11,6 +11,6 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <script src="../resources/utils.js"></script>
</span><del>- <script src="scheme-blob.js?pipe=sub"></script>
</del><ins>+ <script src="scheme-blob.js"></script>
</ins><span class="cx"> </body>
</span><del>-</html>
</del><span class="cx">\ No newline at end of file
</span><ins>+</html>
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicschemeblobjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.js (207204 => 207205)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.js 2016-10-12 08:41:25 UTC (rev 207204)
+++ branches/safari-602-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.js 2016-10-12 08:41:31 UTC (rev 207205)
</span><span class="lines">@@ -30,8 +30,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var blob2 = new Blob(["Blob's data"], { "type" : "text/plain" });
</span><del>-checkKoUrl("blob:http://{{domains[www]}}:{{ports[http][0]}}/", "GET",
- "Fetching [GET] blob:http://{{domains[www]}}:{{ports[http][0]}}/ is KO");
</del><ins>+var blob2URL = URL.createObjectURL(blob2);
+checkKoUrl(blob2URL + "notfoundblob", "GET",
+ "Fetching [GET] not found blob URL is KO");
</ins><span class="cx">
</span><span class="cx"> var invalidRequestMethods = [
</span><span class="cx"> "POST",
</span><span class="lines">@@ -42,7 +43,7 @@
</span><span class="cx"> "INVALID",
</span><span class="cx"> ];
</span><span class="cx"> invalidRequestMethods.forEach(function(method) {
</span><del>- checkKoUrl(URL.createObjectURL(blob2), method, "Fetching [" + method + "] URL.createObjectURL(blob) is KO");
</del><ins>+ checkKoUrl(blob2URL, method, "Fetching [" + method + "] URL.createObjectURL(blob) is KO");
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> done();
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207204 => 207205)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-12 08:41:25 UTC (rev 207204)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-12 08:41:31 UTC (rev 207205)
</span><span class="lines">@@ -1,5 +1,45 @@
</span><span class="cx"> 2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r205190. rdar://problem/28545010
+
+ 2016-08-30 Youenn Fablet <youenn@apple.com>
+
+ [Fetch API] Blob not found URL should result in a network error
+ https://bugs.webkit.org/show_bug.cgi?id=161381
+
+ Reviewed by Sam Weinig.
+
+ Covered by rebased and updated tests.
+
+ Raising a network error if no blob can be found from the URL.
+ It is no longer notified by a 404 response.
+
+ Updated FileReaderLoader to generate the correct exception.
+
+ Made some clean-up in the code, in particular adding an enum class for BlobResourceHandle errors.
+
+ * fileapi/FileReaderLoader.cpp:
+ (WebCore::FileReaderLoader::didFail):
+ (WebCore::FileReaderLoader::toErrorCode):
+ (WebCore::FileReaderLoader::httpStatusCodeToErrorCode):
+ * fileapi/FileReaderLoader.h:
+ * platform/network/BlobResourceHandle.cpp:
+ (WebCore::BlobResourceHandle::loadResourceSynchronously):
+ (WebCore::BlobResourceHandle::doStart):
+ (WebCore::BlobResourceHandle::didGetSize):
+ (WebCore::BlobResourceHandle::readSync):
+ (WebCore::BlobResourceHandle::readFileSync):
+ (WebCore::BlobResourceHandle::readAsync):
+ (WebCore::BlobResourceHandle::didOpen):
+ (WebCore::BlobResourceHandle::didRead):
+ (WebCore::BlobResourceHandle::failed):
+ (WebCore::BlobResourceHandle::notifyResponse):
+ (WebCore::BlobResourceHandle::notifyResponseOnError):
+ (WebCore::BlobResourceHandle::notifyFail):
+ * platform/network/BlobResourceHandle.h:
+
+2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r204631. rdar://problem/28481427
</span><span class="cx">
</span><span class="cx"> 2016-08-19 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorefileapiFileReaderLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/fileapi/FileReaderLoader.cpp (207204 => 207205)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/fileapi/FileReaderLoader.cpp 2016-10-12 08:41:25 UTC (rev 207204)
+++ branches/safari-602-branch/Source/WebCore/fileapi/FileReaderLoader.cpp 2016-10-12 08:41:31 UTC (rev 207205)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "BlobURL.h"
</span><span class="cx"> #include "FileReaderLoaderClient.h"
</span><span class="cx"> #include "HTTPHeaderNames.h"
</span><ins>+#include "ResourceError.h"
</ins><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="lines">@@ -227,13 +228,13 @@
</span><span class="cx"> m_client->didFinishLoading();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FileReaderLoader::didFail(const ResourceError&)
</del><ins>+void FileReaderLoader::didFail(const ResourceError& error)
</ins><span class="cx"> {
</span><span class="cx"> // If we're aborting, do not proceed with normal error handling since it is covered in aborting code.
</span><span class="cx"> if (m_errorCode == FileError::ABORT_ERR)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- failed(FileError::NOT_READABLE_ERR);
</del><ins>+ failed(toErrorCode(static_cast<BlobResourceHandle::Error>(error.errorCode())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FileReaderLoader::failed(int errorCode)
</span><span class="lines">@@ -244,13 +245,21 @@
</span><span class="cx"> m_client->didFail(m_errorCode);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+FileError::ErrorCode FileReaderLoader::toErrorCode(BlobResourceHandle::Error error)
+{
+ switch (error) {
+ case BlobResourceHandle::Error::NotFoundError:
+ return FileError::NOT_FOUND_ERR;
+ default:
+ return FileError::NOT_READABLE_ERR;
+ }
+}
+
</ins><span class="cx"> FileError::ErrorCode FileReaderLoader::httpStatusCodeToErrorCode(int httpStatusCode)
</span><span class="cx"> {
</span><span class="cx"> switch (httpStatusCode) {
</span><span class="cx"> case 403:
</span><span class="cx"> return FileError::SECURITY_ERR;
</span><del>- case 404:
- return FileError::NOT_FOUND_ERR;
</del><span class="cx"> default:
</span><span class="cx"> return FileError::NOT_READABLE_ERR;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorefileapiFileReaderLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/fileapi/FileReaderLoader.h (207204 => 207205)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/fileapi/FileReaderLoader.h 2016-10-12 08:41:25 UTC (rev 207204)
+++ branches/safari-602-branch/Source/WebCore/fileapi/FileReaderLoader.h 2016-10-12 08:41:31 UTC (rev 207205)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #ifndef FileReaderLoader_h
</span><span class="cx"> #define FileReaderLoader_h
</span><span class="cx">
</span><ins>+#include "BlobResourceHandle.h"
</ins><span class="cx"> #include "FileError.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "TextEncoding.h"
</span><span class="lines">@@ -92,6 +93,7 @@
</span><span class="cx"> bool isCompleted() const;
</span><span class="cx">
</span><span class="cx"> static FileError::ErrorCode httpStatusCodeToErrorCode(int);
</span><ins>+ static FileError::ErrorCode toErrorCode(BlobResourceHandle::Error);
</ins><span class="cx">
</span><span class="cx"> ReadType m_readType;
</span><span class="cx"> FileReaderLoaderClient* m_client;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformnetworkBlobResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp (207204 => 207205)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp 2016-10-12 08:41:25 UTC (rev 207204)
+++ branches/safari-602-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp 2016-10-12 08:41:31 UTC (rev 207205)
</span><span class="lines">@@ -55,24 +55,15 @@
</span><span class="cx"> static const int httpOK = 200;
</span><span class="cx"> static const int httpPartialContent = 206;
</span><span class="cx"> static const int httpNotAllowed = 403;
</span><del>-static const int httpNotFound = 404;
</del><span class="cx"> static const int httpRequestedRangeNotSatisfiable = 416;
</span><span class="cx"> static const int httpInternalError = 500;
</span><span class="cx"> static const char* httpOKText = "OK";
</span><span class="cx"> static const char* httpPartialContentText = "Partial Content";
</span><span class="cx"> static const char* httpNotAllowedText = "Not Allowed";
</span><del>-static const char* httpNotFoundText = "Not Found";
</del><span class="cx"> static const char* httpRequestedRangeNotSatisfiableText = "Requested Range Not Satisfiable";
</span><span class="cx"> static const char* httpInternalErrorText = "Internal Server Error";
</span><span class="cx">
</span><span class="cx"> static const char* const webKitBlobResourceDomain = "WebKitBlobResource";
</span><del>-enum {
- notFoundError = 1,
- securityError = 2,
- rangeError = 3,
- notReadableError = 4,
- methodNotAllowed = 5
-};
</del><span class="cx">
</span><span class="cx"> ///////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> // BlobResourceSynchronousLoader
</span><span class="lines">@@ -103,7 +94,7 @@
</span><span class="cx"> {
</span><span class="cx"> // We cannot handle the size that is more than maximum integer.
</span><span class="cx"> if (response.expectedContentLength() > INT_MAX) {
</span><del>- m_error = ResourceError(webKitBlobResourceDomain, notReadableError, response.url(), "File is too large");
</del><ins>+ m_error = ResourceError(webKitBlobResourceDomain, static_cast<int>(BlobResourceHandle::Error::NotReadableError), response.url(), "File is too large");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -132,7 +123,7 @@
</span><span class="cx"> void BlobResourceHandle::loadResourceSynchronously(BlobData* blobData, const ResourceRequest& request, ResourceError& error, ResourceResponse& response, Vector<char>& data)
</span><span class="cx"> {
</span><span class="cx"> if (!equalLettersIgnoringASCIICase(request.httpMethod(), "get")) {
</span><del>- error = ResourceError(webKitBlobResourceDomain, methodNotAllowed, response.url(), "Request method must be GET");
</del><ins>+ error = ResourceError(webKitBlobResourceDomain, static_cast<int>(Error::MethodNotAllowed), response.url(), "Request method must be GET");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -188,18 +179,17 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> // Do not continue if the request is aborted or an error occurs.
</span><del>- if (m_aborted || m_errorCode)
</del><ins>+ if (erroredOrAborted())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!equalLettersIgnoringASCIICase(firstRequest().httpMethod(), "get")) {
</span><del>- notifyFail(methodNotAllowed);
</del><ins>+ notifyFail(Error::MethodNotAllowed);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If the blob data is not found, fail now.
</span><span class="cx"> if (!m_blobData) {
</span><del>- m_errorCode = notFoundError;
- notifyResponse();
</del><ins>+ notifyFail(Error::NotFoundError);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -206,7 +196,7 @@
</span><span class="cx"> // Parse the "Range" header we care about.
</span><span class="cx"> String range = firstRequest().httpHeaderField(HTTPHeaderName::Range);
</span><span class="cx"> if (!range.isEmpty() && !parseRange(range, m_rangeOffset, m_rangeEnd, m_rangeSuffixLength)) {
</span><del>- m_errorCode = rangeError;
</del><ins>+ m_errorCode = Error::RangeError;
</ins><span class="cx"> notifyResponse();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -215,7 +205,7 @@
</span><span class="cx"> getSizeForNext();
</span><span class="cx"> else {
</span><span class="cx"> Ref<BlobResourceHandle> protectedThis(*this); // getSizeForNext calls the client
</span><del>- for (size_t i = 0; i < m_blobData->items().size() && !m_aborted && !m_errorCode; ++i)
</del><ins>+ for (size_t i = 0; i < m_blobData->items().size() && !erroredOrAborted(); ++i)
</ins><span class="cx"> getSizeForNext();
</span><span class="cx"> notifyResponse();
</span><span class="cx"> }
</span><span class="lines">@@ -261,13 +251,12 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> // Do not continue if the request is aborted or an error occurs.
</span><del>- if (m_aborted || m_errorCode)
</del><ins>+ if (erroredOrAborted())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If the size is -1, it means the file has been moved or changed. Fail now.
</span><span class="cx"> if (size == -1) {
</span><del>- m_errorCode = notFoundError;
- notifyResponse();
</del><ins>+ notifyFail(Error::NotFoundError);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -329,13 +318,13 @@
</span><span class="cx"> int remaining = length;
</span><span class="cx"> while (remaining) {
</span><span class="cx"> // Do not continue if the request is aborted or an error occurs.
</span><del>- if (m_aborted || m_errorCode)
</del><ins>+ if (erroredOrAborted())
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> // If there is no more remaining data to read, we are done.
</span><span class="cx"> if (!m_totalRemainingSize || m_readItemCount >= m_blobData->items().size())
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> const BlobDataItem& item = m_blobData->items().at(m_readItemCount);
</span><span class="cx"> int bytesRead = 0;
</span><span class="cx"> if (item.type() == BlobDataItem::Type::Data)
</span><span class="lines">@@ -352,7 +341,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int result;
</span><del>- if (m_aborted || m_errorCode)
</del><ins>+ if (erroredOrAborted())
</ins><span class="cx"> result = -1;
</span><span class="cx"> else
</span><span class="cx"> result = length - remaining;
</span><span class="lines">@@ -401,7 +390,7 @@
</span><span class="cx"> bool success = m_stream->openForRead(item.file()->path(), item.offset() + m_currentItemReadSize, bytesToRead);
</span><span class="cx"> m_currentItemReadSize = 0;
</span><span class="cx"> if (!success) {
</span><del>- m_errorCode = notReadableError;
</del><ins>+ m_errorCode = Error::NotReadableError;
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -410,7 +399,7 @@
</span><span class="cx">
</span><span class="cx"> int bytesRead = m_stream->read(buf, length);
</span><span class="cx"> if (bytesRead < 0) {
</span><del>- m_errorCode = notReadableError;
</del><ins>+ m_errorCode = Error::NotReadableError;
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> if (!bytesRead) {
</span><span class="lines">@@ -429,7 +418,7 @@
</span><span class="cx"> ASSERT(m_async);
</span><span class="cx">
</span><span class="cx"> // Do not continue if the request is aborted or an error occurs.
</span><del>- if (m_aborted || m_errorCode)
</del><ins>+ if (erroredOrAborted())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If there is no more remaining data to read, we are done.
</span><span class="lines">@@ -485,7 +474,7 @@
</span><span class="cx"> ASSERT(m_async);
</span><span class="cx">
</span><span class="cx"> if (!success) {
</span><del>- failed(notReadableError);
</del><ins>+ failed(Error::NotReadableError);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -496,7 +485,7 @@
</span><span class="cx"> void BlobResourceHandle::didRead(int bytesRead)
</span><span class="cx"> {
</span><span class="cx"> if (bytesRead < 0) {
</span><del>- failed(notReadableError);
</del><ins>+ failed(Error::NotReadableError);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -533,7 +522,7 @@
</span><span class="cx"> readAsync();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BlobResourceHandle::failed(int errorCode)
</del><ins>+void BlobResourceHandle::failed(Error errorCode)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_async);
</span><span class="cx"> Ref<BlobResourceHandle> protectedThis(*this);
</span><span class="lines">@@ -553,7 +542,7 @@
</span><span class="cx"> if (!client())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_errorCode) {
</del><ins>+ if (m_errorCode != Error::NoError) {
</ins><span class="cx"> Ref<BlobResourceHandle> protectedThis(*this);
</span><span class="cx"> notifyResponseOnError();
</span><span class="cx"> notifyFinish();
</span><span class="lines">@@ -590,19 +579,15 @@
</span><span class="cx">
</span><span class="cx"> void BlobResourceHandle::notifyResponseOnError()
</span><span class="cx"> {
</span><del>- ASSERT(m_errorCode);
</del><ins>+ ASSERT(m_errorCode != Error::NoError);
</ins><span class="cx">
</span><span class="cx"> ResourceResponse response(firstRequest().url(), "text/plain", 0, String());
</span><span class="cx"> switch (m_errorCode) {
</span><del>- case rangeError:
</del><ins>+ case Error::RangeError:
</ins><span class="cx"> response.setHTTPStatusCode(httpRequestedRangeNotSatisfiable);
</span><span class="cx"> response.setHTTPStatusText(httpRequestedRangeNotSatisfiableText);
</span><span class="cx"> break;
</span><del>- case notFoundError:
- response.setHTTPStatusCode(httpNotFound);
- response.setHTTPStatusText(httpNotFoundText);
- break;
- case securityError:
</del><ins>+ case Error::SecurityError:
</ins><span class="cx"> response.setHTTPStatusCode(httpNotAllowed);
</span><span class="cx"> response.setHTTPStatusText(httpNotAllowedText);
</span><span class="cx"> break;
</span><span class="lines">@@ -626,10 +611,10 @@
</span><span class="cx"> client()->didReceiveBuffer(this, SharedBuffer::create(data, bytesRead), bytesRead);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BlobResourceHandle::notifyFail(int errorCode)
</del><ins>+void BlobResourceHandle::notifyFail(Error errorCode)
</ins><span class="cx"> {
</span><span class="cx"> if (client())
</span><del>- client()->didFail(this, ResourceError(webKitBlobResourceDomain, errorCode, firstRequest().url(), String()));
</del><ins>+ client()->didFail(this, ResourceError(webKitBlobResourceDomain, static_cast<int>(errorCode), firstRequest().url(), String()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void doNotifyFinish(BlobResourceHandle& handle)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformnetworkBlobResourceHandleh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/network/BlobResourceHandle.h (207204 => 207205)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/network/BlobResourceHandle.h 2016-10-12 08:41:25 UTC (rev 207204)
+++ branches/safari-602-branch/Source/WebCore/platform/network/BlobResourceHandle.h 2016-10-12 08:41:31 UTC (rev 207205)
</span><span class="lines">@@ -55,6 +55,15 @@
</span><span class="cx">
</span><span class="cx"> bool aborted() const { return m_aborted; }
</span><span class="cx">
</span><ins>+ enum class Error {
+ NoError = 0,
+ NotFoundError = 1,
+ SecurityError = 2,
+ RangeError = 3,
+ NotReadableError = 4,
+ MethodNotAllowed = 5
+ };
+
</ins><span class="cx"> private:
</span><span class="cx"> BlobResourceHandle(BlobData*, const ResourceRequest&, ResourceHandleClient*, bool async);
</span><span class="cx"> virtual ~BlobResourceHandle();
</span><span class="lines">@@ -72,7 +81,7 @@
</span><span class="cx"> void getSizeForNext();
</span><span class="cx"> void seek();
</span><span class="cx"> void consumeData(const char* data, int bytesRead);
</span><del>- void failed(int errorCode);
</del><ins>+ void failed(Error);
</ins><span class="cx">
</span><span class="cx"> void readAsync();
</span><span class="cx"> void readDataAsync(const BlobDataItem&);
</span><span class="lines">@@ -85,9 +94,11 @@
</span><span class="cx"> void notifyResponseOnSuccess();
</span><span class="cx"> void notifyResponseOnError();
</span><span class="cx"> void notifyReceiveData(const char*, int);
</span><del>- void notifyFail(int errorCode);
</del><ins>+ void notifyFail(Error);
</ins><span class="cx"> void notifyFinish();
</span><span class="cx">
</span><ins>+ bool erroredOrAborted() const { return m_aborted || m_errorCode != Error::NoError; }
+
</ins><span class="cx"> enum { kPositionNotSpecified = -1 };
</span><span class="cx">
</span><span class="cx"> RefPtr<BlobData> m_blobData;
</span><span class="lines">@@ -96,7 +107,7 @@
</span><span class="cx"> std::unique_ptr<FileStream> m_stream; // For synchronous loading.
</span><span class="cx"> Vector<char> m_buffer;
</span><span class="cx"> Vector<long long> m_itemLengthList;
</span><del>- int m_errorCode { 0 };
</del><ins>+ Error m_errorCode { Error::NoError };
</ins><span class="cx"> bool m_aborted { false };
</span><span class="cx"> long long m_rangeOffset { kPositionNotSpecified };
</span><span class="cx"> long long m_rangeEnd { kPositionNotSpecified };
</span></span></pre>
</div>
</div>
</body>
</html>