<!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>[203961] 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/203961">203961</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-31 23:00:56 -0700 (Sun, 31 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fetch Response built-ins should use @makeThisTypeError
https://bugs.webkit.org/show_bug.cgi?id=160290
Patch by Youenn Fablet <youenn@apple.com> on 2016-07-31
Reviewed by Darin Adler.
Source/WebCore:
Covered by updated test.
Fixed type error checks.
Making use of @makeThisTypeError to have the correct error message.
Updating arrayBuffer, blob, json and text to return rejected promises in lieu of throwing
in case the 'this' value is not q Response object.
* Modules/fetch/FetchResponse.js:
(clone): Updated instanceof check and making use of @makeThisTypeError.
(arrayBuffer): Ditto.
(blob): Ditto.
(formData): Ditto.
(json): Ditto.
(text): Ditto.
LayoutTests:
* fetch/fetch-error-messages-expected.txt:
* fetch/fetch-error-messages.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfetchfetcherrormessagesexpectedtxt">trunk/LayoutTests/fetch/fetch-error-messages-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfetchfetcherrormessageshtml">trunk/LayoutTests/fetch/fetch-error-messages.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponsejs">trunk/Source/WebCore/Modules/fetch/FetchResponse.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203960 => 203961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-01 05:43:57 UTC (rev 203960)
+++ trunk/LayoutTests/ChangeLog 2016-08-01 06:00:56 UTC (rev 203961)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-07-31 Youenn Fablet <youenn@apple.com>
+
+ Fetch Response built-ins should use @makeThisTypeError
+ https://bugs.webkit.org/show_bug.cgi?id=160290
+
+ Reviewed by Darin Adler.
+
+ * fetch/fetch-error-messages-expected.txt:
+ * fetch/fetch-error-messages.html:
+
</ins><span class="cx"> 2016-07-31 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Add a check for touch event listener on iOS accessibility object
</span></span></pre></div>
<a id="trunkLayoutTestsfetchfetcherrormessagesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fetch/fetch-error-messages-expected.txt (203960 => 203961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fetch/fetch-error-messages-expected.txt 2016-08-01 05:43:57 UTC (rev 203960)
+++ trunk/LayoutTests/fetch/fetch-error-messages-expected.txt 2016-08-01 06:00:56 UTC (rev 203961)
</span><span class="lines">@@ -1,6 +1,12 @@
</span><ins>+CONSOLE MESSAGE: line 11: TypeError: Can only call Response.clone on instances of Response
</ins><span class="cx"> CONSOLE MESSAGE: line 11: TypeError: The Response.body getter can only be used on instances of Response
</span><span class="cx"> CONSOLE MESSAGE: line 11: TypeError: The Request.method getter can only be used on instances of Request
</span><span class="cx"> CONSOLE MESSAGE: line 11: TypeError: Can only call Request.clone on instances of Request
</span><ins>+CONSOLE MESSAGE: line 18: Promise rejected with: TypeError: Can only call Response.arrayBuffer on instances of Response
+CONSOLE MESSAGE: line 18: Promise rejected with: TypeError: Can only call Response.blob on instances of Response
+CONSOLE MESSAGE: line 18: Promise rejected with: TypeError: Can only call Response.formData on instances of Response
+CONSOLE MESSAGE: line 18: Promise rejected with: TypeError: Can only call Response.json on instances of Response
+CONSOLE MESSAGE: line 18: Promise rejected with: TypeError: Can only call Response.text on instances of Response
</ins><span class="cx">
</span><del>-PASS Exercising TypeError messages in Fetch Response
</del><ins>+PASS Exercising TypeError messages in Fetch Request and Response
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfetchfetcherrormessageshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fetch/fetch-error-messages.html (203960 => 203961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fetch/fetch-error-messages.html 2016-08-01 05:43:57 UTC (rev 203960)
+++ trunk/LayoutTests/fetch/fetch-error-messages.html 2016-08-01 06:00:56 UTC (rev 203961)
</span><span class="lines">@@ -12,6 +12,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function printPromiseMethodError(method, target)
+{
+ return method.call(target).then(assert_unreached, (e) => {
+ console.log("Promise rejected with: " + e);
+ });
+}
+
</ins><span class="cx"> function printGetterError(object, getterName, target)
</span><span class="cx"> {
</span><span class="cx"> const getter = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(object), getterName).get;
</span><span class="lines">@@ -18,15 +25,23 @@
</span><span class="cx"> printMethodError(getter, target);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-test(function(test) {
</del><ins>+promise_test(function(test) {
</ins><span class="cx"> // This test prints exceptions to check the format of their messages.
</span><span class="cx">
</span><span class="cx"> var request = new Request("");
</span><span class="cx"> var response = new Response("");
</span><span class="cx">
</span><del>- printGetterError(response, "body", request);
- printGetterError(request, "method", response);
- printMethodError(request.clone, response);
-
-}, "Exercising TypeError messages in Fetch Response");
</del><ins>+ var results = [
+ printMethodError(response.clone, request),
+ printPromiseMethodError(response.arrayBuffer, request),
+ printPromiseMethodError(response.blob, request),
+ printPromiseMethodError(response.formData, request),
+ printPromiseMethodError(response.json, request),
+ printPromiseMethodError(response.text, request),
+ printGetterError(response, "body", request),
+ printGetterError(request, "method", response),
+ printMethodError(request.clone, response),
+ ];
+ return Promise.all(results);
+}, "Exercising TypeError messages in Fetch Request and Response");
</ins><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203960 => 203961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-01 05:43:57 UTC (rev 203960)
+++ trunk/Source/WebCore/ChangeLog 2016-08-01 06:00:56 UTC (rev 203961)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-07-31 Youenn Fablet <youenn@apple.com>
+
+ Fetch Response built-ins should use @makeThisTypeError
+ https://bugs.webkit.org/show_bug.cgi?id=160290
+
+ Reviewed by Darin Adler.
+
+ Covered by updated test.
+
+ Fixed type error checks.
+ Making use of @makeThisTypeError to have the correct error message.
+ Updating arrayBuffer, blob, json and text to return rejected promises in lieu of throwing
+ in case the 'this' value is not q Response object.
+
+ * Modules/fetch/FetchResponse.js:
+ (clone): Updated instanceof check and making use of @makeThisTypeError.
+ (arrayBuffer): Ditto.
+ (blob): Ditto.
+ (formData): Ditto.
+ (json): Ditto.
+ (text): Ditto.
+
</ins><span class="cx"> 2016-07-31 Adrian Perez de Castro <aperez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Implement missing WebCore::moveFile() using GLib functions
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.js (203960 => 203961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.js 2016-08-01 05:43:57 UTC (rev 203960)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.js 2016-08-01 06:00:56 UTC (rev 203961)
</span><span class="lines">@@ -80,8 +80,8 @@
</span><span class="cx">
</span><span class="cx"> function clone()
</span><span class="cx"> {
</span><del>- if (!this instanceof @Response)
- throw new @TypeError("Function should be called on a Response");
</del><ins>+ if (!(this instanceof @Response))
+ throw @makeThisTypeError("Response", "clone");
</ins><span class="cx">
</span><span class="cx"> if (@Response.prototype.@isDisturbed.@call(this))
</span><span class="cx"> throw new @TypeError("Cannot clone a disturbed Response");
</span><span class="lines">@@ -98,8 +98,8 @@
</span><span class="cx"> // consume and consumeStream single parameter should be kept in sync with FetchBodyConsumer::Type.
</span><span class="cx"> function arrayBuffer()
</span><span class="cx"> {
</span><del>- if (!this instanceof @Response)
- throw new @TypeError("Function should be called on a Response");
</del><ins>+ if (!(this instanceof @Response))
+ return @Promise.@reject(@makeThisTypeError("Response", "arrayBuffer"));
</ins><span class="cx">
</span><span class="cx"> const arrayBufferConsumerType = 1;
</span><span class="cx"> if (!this.@body)
</span><span class="lines">@@ -110,8 +110,8 @@
</span><span class="cx">
</span><span class="cx"> function blob()
</span><span class="cx"> {
</span><del>- if (!this instanceof @Response)
- throw new @TypeError("Function should be called on a Response");
</del><ins>+ if (!(this instanceof @Response))
+ return @Promise.@reject(@makeThisTypeError("Response", "blob"));
</ins><span class="cx">
</span><span class="cx"> const blobConsumerType = 2;
</span><span class="cx"> if (!this.@body)
</span><span class="lines">@@ -122,8 +122,8 @@
</span><span class="cx">
</span><span class="cx"> function formData()
</span><span class="cx"> {
</span><del>- if (!this instanceof @Response)
- throw new @TypeError("Function should be called on a Response");
</del><ins>+ if (!(this instanceof @Response))
+ return @Promise.@reject(@makeThisTypeError("Response", "formData"));
</ins><span class="cx">
</span><span class="cx"> return @Promise.@reject("Not implemented");
</span><span class="cx"> }
</span><span class="lines">@@ -130,8 +130,8 @@
</span><span class="cx">
</span><span class="cx"> function json()
</span><span class="cx"> {
</span><del>- if (!this instanceof @Response)
- throw new @TypeError("Function should be called on a Response");
</del><ins>+ if (!(this instanceof @Response))
+ return @Promise.@reject(@makeThisTypeError("Response", "json"));
</ins><span class="cx">
</span><span class="cx"> const jsonConsumerType = 3;
</span><span class="cx"> if (!this.@body)
</span><span class="lines">@@ -142,8 +142,8 @@
</span><span class="cx">
</span><span class="cx"> function text()
</span><span class="cx"> {
</span><del>- if (!this instanceof @Response)
- throw new @TypeError("Function should be called on a Response");
</del><ins>+ if (!(this instanceof @Response))
+ return @Promise.@reject(@makeThisTypeError("Response", "text"));
</ins><span class="cx">
</span><span class="cx"> const textConsumerType = 4;
</span><span class="cx"> if (!this.@body)
</span></span></pre>
</div>
</div>
</body>
</html>