<!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>[198151] 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/198151">198151</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-03-14 13:13:30 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Fetch API] FetchLoader should check for empty bodies
https://bugs.webkit.org/show_bug.cgi?id=155440
Reviewed by Darin Adler.
LayoutTests/imported/w3c:
* web-platform-tests/fetch/api/request/request-consume-empty-expected.txt:
* web-platform-tests/fetch/api/request/request-consume-empty.html:
* web-platform-tests/fetch/api/response/response-consume-empty-expected.txt:
* web-platform-tests/fetch/api/response/response-consume-empty.html:
Source/WebCore:
Covered by added tests.
* Modules/fetch/FetchLoader.cpp:
(WebCore::FetchLoader::didFinishLoading): returning empty array buffer/empty string if no data received during loading.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestconsumeemptyexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume-empty-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestconsumeemptyhtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume-empty.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresponseresponseconsumeemptyexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-consume-empty-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresponseresponseconsumeemptyhtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-consume-empty.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchLoadercpp">trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (198150 => 198151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-03-14 20:07:16 UTC (rev 198150)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-03-14 20:13:30 UTC (rev 198151)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-03-14 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><ins>+ [Fetch API] FetchLoader should check for empty bodies
+ https://bugs.webkit.org/show_bug.cgi?id=155440
+
+ Reviewed by Darin Adler.
+
+ * web-platform-tests/fetch/api/request/request-consume-empty-expected.txt:
+ * web-platform-tests/fetch/api/request/request-consume-empty.html:
+ * web-platform-tests/fetch/api/response/response-consume-empty-expected.txt:
+ * web-platform-tests/fetch/api/response/response-consume-empty.html:
+
+2016-03-14 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
</ins><span class="cx"> [Fetch API] Implement data resolution for blob stored in Body
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155359
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestconsumeemptyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume-empty-expected.txt (198150 => 198151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume-empty-expected.txt 2016-03-14 20:07:16 UTC (rev 198150)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume-empty-expected.txt 2016-03-14 20:13:30 UTC (rev 198151)
</span><span class="lines">@@ -4,4 +4,8 @@
</span><span class="cx"> PASS Consume request's body as arrayBuffer
</span><span class="cx"> PASS Consume request's body as json
</span><span class="cx"> FAIL Consume request's body as formData promise_test: Unhandled rejection with value: undefined
</span><ins>+PASS Consume empty blob request body as arrayBuffer
+PASS Consume empty text request body as arrayBuffer
+PASS Consume empty blob request body as text
+PASS Consume empty text request body as text
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestconsumeemptyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume-empty.html (198150 => 198151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume-empty.html 2016-03-14 20:07:16 UTC (rev 198150)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-consume-empty.html 2016-03-14 20:13:30 UTC (rev 198151)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function checkRequestBody(bodyType, checkFunction) {
</del><ins>+ function checkRequestWithNoBody(bodyType, checkFunction) {
</ins><span class="cx"> promise_test(function(test) {
</span><span class="cx"> var request = new Request("", {"method": "POST"});
</span><span class="cx"> assert_false(request.bodyUsed);
</span><span class="lines">@@ -70,12 +70,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var formData = new FormData();
</span><del>- checkRequestBody("text", checkBodyText);
- checkRequestBody("blob", checkBodyBlob);
- checkRequestBody("arrayBuffer", checkBodyArrayBuffer);
- checkRequestBody("json", checkBodyJSON);
- checkRequestBody("formData", checkBodyFormData);
</del><ins>+ checkRequestWithNoBody("text", checkBodyText);
+ checkRequestWithNoBody("blob", checkBodyBlob);
+ checkRequestWithNoBody("arrayBuffer", checkBodyArrayBuffer);
+ checkRequestWithNoBody("json", checkBodyJSON);
+ checkRequestWithNoBody("formData", checkBodyFormData);
</ins><span class="cx">
</span><ins>+ function checkRequestWithEmptyBody(bodyType, body, asText) {
+ promise_test(function(test) {
+ var request = new Request("", {"method": "POST", "body" : body});
+ assert_false(request.bodyUsed, "bodyUsed is false at init");
+ if (asText) {
+ return request.text().then(function(bodyAsString) {
+ assert_equals(bodyAsString.length, 0, "Resolved value should be empty");
+ assert_true(request.bodyUsed, "bodyUsed is true after being consumed");
+ });
+ }
+ return request.arrayBuffer().then(function(bodyAsArrayBuffer) {
+ assert_equals(bodyAsArrayBuffer.byteLength, 0, "Resolved value should be empty");
+ assert_true(request.bodyUsed, "bodyUsed is true after being consumed");
+ });
+ }, "Consume empty " + bodyType + " request body as " + (asText ? "text" : "arrayBuffer"));
+ }
+
+ // FIXME: Add BufferSource, FormData and URLSearchParams.
+ checkRequestWithEmptyBody("blob", new Blob([], { "type" : "text/plain" }), false);
+ checkRequestWithEmptyBody("text", "", false);
+ checkRequestWithEmptyBody("blob", new Blob([], { "type" : "text/plain" }), true);
+ checkRequestWithEmptyBody("text", "", true);
</ins><span class="cx"> </script>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresponseresponseconsumeemptyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-consume-empty-expected.txt (198150 => 198151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-consume-empty-expected.txt 2016-03-14 20:07:16 UTC (rev 198150)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-consume-empty-expected.txt 2016-03-14 20:13:30 UTC (rev 198151)
</span><span class="lines">@@ -4,4 +4,8 @@
</span><span class="cx"> PASS Consume response's body as arrayBuffer
</span><span class="cx"> PASS Consume response's body as json
</span><span class="cx"> FAIL Consume response's body as formData promise_test: Unhandled rejection with value: undefined
</span><ins>+PASS Consume empty blob response body as arrayBuffer
+PASS Consume empty text response body as arrayBuffer
+PASS Consume empty blob response body as text
+PASS Consume empty text response body as text
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresponseresponseconsumeemptyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-consume-empty.html (198150 => 198151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-consume-empty.html 2016-03-14 20:07:16 UTC (rev 198150)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-consume-empty.html 2016-03-14 20:13:30 UTC (rev 198151)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function checkResponseBody(bodyType, checkFunction) {
</del><ins>+ function checkResponseWithNoBody(bodyType, checkFunction) {
</ins><span class="cx"> promise_test(function(test) {
</span><span class="cx"> var response = new Response();
</span><span class="cx"> assert_false(response.bodyUsed);
</span><span class="lines">@@ -70,12 +70,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var formData = new FormData();
</span><del>- checkResponseBody("text", checkBodyText);
- checkResponseBody("blob", checkBodyBlob);
- checkResponseBody("arrayBuffer", checkBodyArrayBuffer);
- checkResponseBody("json", checkBodyJSON);
- checkResponseBody("formData", checkBodyFormData);
</del><ins>+ checkResponseWithNoBody("text", checkBodyText);
+ checkResponseWithNoBody("blob", checkBodyBlob);
+ checkResponseWithNoBody("arrayBuffer", checkBodyArrayBuffer);
+ checkResponseWithNoBody("json", checkBodyJSON);
+ checkResponseWithNoBody("formData", checkBodyFormData);
</ins><span class="cx">
</span><ins>+ function checkResponseWithEmptyBody(bodyType, body, asText) {
+ promise_test(function(test) {
+ var response = new Response("", {"method": "POST", "body" : body});
+ assert_false(response.bodyUsed, "bodyUsed is false at init");
+ if (asText) {
+ return response.text().then(function(bodyAsString) {
+ assert_equals(bodyAsString.length, 0, "Resolved value should be empty");
+ assert_true(response.bodyUsed, "bodyUsed is true after being consumed");
+ });
+ }
+ return response.arrayBuffer().then(function(bodyAsArrayBuffer) {
+ assert_equals(bodyAsArrayBuffer.byteLength, 0, "Resolved value should be empty");
+ assert_true(response.bodyUsed, "bodyUsed is true after being consumed");
+ });
+ }, "Consume empty " + bodyType + " response body as " + (asText ? "text" : "arrayBuffer"));
+ }
+
+ // FIXME: Add BufferSource, FormData and URLSearchParams.
+ checkResponseWithEmptyBody("blob", new Blob([], { "type" : "text/plain" }), false);
+ checkResponseWithEmptyBody("text", "", false);
+ checkResponseWithEmptyBody("blob", new Blob([], { "type" : "text/plain" }), true);
+ checkResponseWithEmptyBody("text", "", true);
</ins><span class="cx"> </script>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198150 => 198151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-14 20:07:16 UTC (rev 198150)
+++ trunk/Source/WebCore/ChangeLog 2016-03-14 20:13:30 UTC (rev 198151)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-14 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Fetch API] FetchLoader should check for empty bodies
+ https://bugs.webkit.org/show_bug.cgi?id=155440
+
+ Reviewed by Darin Adler.
+
+ Covered by added tests.
+
+ * Modules/fetch/FetchLoader.cpp:
+ (WebCore::FetchLoader::didFinishLoading): returning empty array buffer/empty string if no data received during loading.
+
</ins><span class="cx"> 2016-03-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Regression(r197981): Huge regression on Mac PLT
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp (198150 => 198151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp 2016-03-14 20:07:16 UTC (rev 198150)
+++ trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp 2016-03-14 20:13:30 UTC (rev 198151)
</span><span class="lines">@@ -100,9 +100,9 @@
</span><span class="cx"> void FetchLoader::didFinishLoading(unsigned long, double)
</span><span class="cx"> {
</span><span class="cx"> if (m_type == Type::ArrayBuffer)
</span><del>- m_client.didFinishLoadingAsArrayBuffer(m_data->createArrayBuffer());
</del><ins>+ m_client.didFinishLoadingAsArrayBuffer(m_data ? m_data->createArrayBuffer() : ArrayBuffer::create(nullptr, 0));
</ins><span class="cx"> else
</span><del>- m_client.didFinishLoadingAsText(TextResourceDecoder::create(ASCIILiteral("text/plain"), "UTF-8")->decodeAndFlush(m_data->data(), m_data->size()));
</del><ins>+ m_client.didFinishLoadingAsText(m_data ? TextResourceDecoder::create(ASCIILiteral("text/plain"), "UTF-8")->decodeAndFlush(m_data->data(), m_data->size()): String());
</ins><span class="cx"> m_data = nullptr;
</span><span class="cx">
</span><span class="cx"> m_client.didSucceed();
</span></span></pre>
</div>
</div>
</body>
</html>