<!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>[206770] 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/206770">206770</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-04 08:17:34 -0700 (Tue, 04 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Fetch API] ReadableStream should be errored with TypeError values
https://bugs.webkit.org/show_bug.cgi?id=162895
Patch by Youenn Fablet <youenn@apple.com> on 2016-10-04
Reviewed by Alex Christensen.
LayoutTests/imported/w3c:
* web-platform-tests/fetch/api/basic/error-after-response-expected.txt: Added.
* web-platform-tests/fetch/api/basic/error-after-response.html: Added.
* web-platform-tests/fetch/api/resources/bad-chunk-encoding.py: Added.
(main):
* web-platform-tests/fetch/api/response/response-consume-stream-expected.txt:
Source/WebCore:
Test: imported/w3c/web-platform-tests/fetch/api/basic/error-after-response.html
* Modules/fetch/FetchResponse.cpp:
(WebCore::FetchResponse::BodyLoader::didFail): Removing FIXME.
* bindings/js/ReadableStreamDefaultController.h:
(WebCore::ReadableStreamDefaultController::error<String>): Erroring with TypeError values.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresponseresponseconsumestreamexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-consume-stream-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponsecpp">trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableStreamDefaultControllerh">trunk/Source/WebCore/bindings/js/ReadableStreamDefaultController.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapibasicerrorafterresponseexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/error-after-response-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapibasicerrorafterresponsehtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/error-after-response.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcesbadchunkencodingpy">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/bad-chunk-encoding.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (206769 => 206770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-10-04 15:15:35 UTC (rev 206769)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-10-04 15:17:34 UTC (rev 206770)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-10-04 Youenn Fablet <youenn@apple.com>
+
+ [Fetch API] ReadableStream should be errored with TypeError values
+ https://bugs.webkit.org/show_bug.cgi?id=162895
+
+ Reviewed by Alex Christensen.
+
+ * web-platform-tests/fetch/api/basic/error-after-response-expected.txt: Added.
+ * web-platform-tests/fetch/api/basic/error-after-response.html: Added.
+ * web-platform-tests/fetch/api/resources/bad-chunk-encoding.py: Added.
+ (main):
+ * web-platform-tests/fetch/api/response/response-consume-stream-expected.txt:
+
</ins><span class="cx"> 2016-10-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for KeyboardEvent.key attribute
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapibasicerrorafterresponseexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/error-after-response-expected.txt (0 => 206770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/error-after-response-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/error-after-response-expected.txt 2016-10-04 15:17:34 UTC (rev 206770)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+PASS Response reader read() promise should reject after a network error happening after resolving fetch promise
+PASS Response reader closed promise should reject after a network error happening after resolving fetch promise
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapibasicerrorafterresponsehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/error-after-response.html (0 => 206770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/error-after-response.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/error-after-response.html 2016-10-04 15:17:34 UTC (rev 206770)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <title>Fetch: network timeout after receiving the HTTP response headers</title>
+ <script src="/resources/testharness.js"></script>
+ <script src="/resources/testharnessreport.js"></script>
+ <script src="../resources/utils.js"></script>
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+function checkReader(test, reader, checkRead)
+{
+ return reader.read().then((value) => {
+ validateBufferFromString(value.value, "TEST_CHUNK", "Should receive first chunk");
+ return promise_rejects(test, new TypeError(), checkRead ? reader.read() : reader.closed);
+ });
+}
+
+promise_test((test) => {
+ return fetch("../resources/bad-chunk-encoding.py?count=1").then((response) => {
+ return checkReader(test, response.body.getReader(), true);
+ });
+}, "Response reader read() promise should reject after a network error happening after resolving fetch promise");
+
+promise_test((test) => {
+ return fetch("../resources/bad-chunk-encoding.py?count=1").then((response) => {
+ return checkReader(test, response.body.getReader(), false);
+ });
+}, "Response reader closed promise should reject after a network error happening after resolving fetch promise");
+ </script>
+ </body>
+</html>
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresourcesbadchunkencodingpy"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/bad-chunk-encoding.py (0 => 206770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/bad-chunk-encoding.py (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/resources/bad-chunk-encoding.py 2016-10-04 15:17:34 UTC (rev 206770)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+import time
+
+def main(request, response):
+ delay = float(request.GET.first("ms", 1000)) / 1E3
+ count = int(request.GET.first("count", 50))
+ time.sleep(delay)
+ response.headers.set("Transfer-Encoding", "chunked")
+ response.write_status_headers()
+ time.sleep(delay);
+ for i in xrange(count):
+ response.writer.write_content("a\r\nTEST_CHUNK\r\n")
+ time.sleep(delay)
+ response.writer.write_content("garbage")
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresponseresponseconsumestreamexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-consume-stream-expected.txt (206769 => 206770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-consume-stream-expected.txt 2016-10-04 15:15:35 UTC (rev 206769)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-consume-stream-expected.txt 2016-10-04 15:17:34 UTC (rev 206770)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PASS Read text response's body as readableStream
</span><span class="cx"> PASS Read text response's body as readableStream
</span><span class="cx"> PASS Read array buffer response's body as readableStream
</span><del>-FAIL Read form data response's body as readableStream promise_test: Unhandled rejection with value: "not implemented"
</del><ins>+FAIL Read form data response's body as readableStream promise_test: Unhandled rejection with value: object "TypeError: not implemented"
</ins><span class="cx"> PASS Getting an error Response stream
</span><span class="cx"> PASS Getting a redirect Response stream
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206769 => 206770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-04 15:15:35 UTC (rev 206769)
+++ trunk/Source/WebCore/ChangeLog 2016-10-04 15:17:34 UTC (rev 206770)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-04 Youenn Fablet <youenn@apple.com>
+
+ [Fetch API] ReadableStream should be errored with TypeError values
+ https://bugs.webkit.org/show_bug.cgi?id=162895
+
+ Reviewed by Alex Christensen.
+
+ Test: imported/w3c/web-platform-tests/fetch/api/basic/error-after-response.html
+
+ * Modules/fetch/FetchResponse.cpp:
+ (WebCore::FetchResponse::BodyLoader::didFail): Removing FIXME.
+ * bindings/js/ReadableStreamDefaultController.h:
+ (WebCore::ReadableStreamDefaultController::error<String>): Erroring with TypeError values.
+
</ins><span class="cx"> 2016-10-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Bindings do not throw a TypeError if a required dictionary member is missing
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp (206769 => 206770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-10-04 15:15:35 UTC (rev 206769)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-10-04 15:17:34 UTC (rev 206770)
</span><span class="lines">@@ -159,8 +159,6 @@
</span><span class="cx"> if (m_loader->isStarted())
</span><span class="cx"> m_response.m_bodyLoader = Nullopt;
</span><span class="cx">
</span><del>- // FIXME: Handle the case of failing after didReceiveResponse is called.
-
</del><span class="cx"> m_response.unsetPendingActivity(&m_response);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableStreamDefaultControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableStreamDefaultController.h (206769 => 206770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableStreamDefaultController.h 2016-10-04 15:15:35 UTC (rev 206769)
+++ trunk/Source/WebCore/bindings/js/ReadableStreamDefaultController.h 2016-10-04 15:17:34 UTC (rev 206770)
</span><span class="lines">@@ -108,11 +108,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<>
</span><del>-inline void ReadableStreamDefaultController::error<String>(const String& result)
</del><ins>+inline void ReadableStreamDefaultController::error<String>(const String& errorMessage)
</ins><span class="cx"> {
</span><span class="cx"> JSC::ExecState& state = globalExec();
</span><span class="cx"> JSC::JSLockHolder locker(&state);
</span><del>- error(state, jsString(&state, result));
</del><ins>+ error(state, JSC::createTypeError(&state, errorMessage));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>