<!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>[186112] 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/186112">186112</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-06-30 02:27:49 -0700 (Tue, 30 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Synced bad strategy test with reference implementation
https://bugs.webkit.org/show_bug.cgi?id=146411
Reviewed by Darin Adler.
Source/WebCore:
Current tests cover the case.
* bindings/js/ReadableJSStream.cpp:
(WebCore::ReadableJSStream::retrieveChunkSize): Check for negative size then running the JavaScript function.
LayoutTests:
* streams/reference-implementation/bad-strategies-expected.txt:
* streams/reference-implementation/bad-strategies.html: There are three tests that are merged into one and a
fourth check is added. Updated expectations accordingly.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationbadstrategiesexpectedtxt">trunk/LayoutTests/streams/reference-implementation/bad-strategies-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationbadstrategieshtml">trunk/LayoutTests/streams/reference-implementation/bad-strategies.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableJSStreamcpp">trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186111 => 186112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-30 07:50:12 UTC (rev 186111)
+++ trunk/LayoutTests/ChangeLog 2015-06-30 09:27:49 UTC (rev 186112)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-06-30 Youenn Fablet <youenn.fablet@crf.canon.fr> and Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] Synced bad strategy test with reference implementation
+ https://bugs.webkit.org/show_bug.cgi?id=146411
+
+ Reviewed by Darin Adler.
+
+ * streams/reference-implementation/bad-strategies-expected.txt:
+ * streams/reference-implementation/bad-strategies.html: There are three tests that are merged into one and a
+ fourth check is added. Updated expectations accordingly.
+
</ins><span class="cx"> 2015-06-29 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Another rebaseline after r186086.
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationbadstrategiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/bad-strategies-expected.txt (186111 => 186112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/bad-strategies-expected.txt 2015-06-30 07:50:12 UTC (rev 186111)
+++ trunk/LayoutTests/streams/reference-implementation/bad-strategies-expected.txt 2015-06-30 09:27:49 UTC (rev 186112)
</span><span class="lines">@@ -4,7 +4,5 @@
</span><span class="cx"> PASS Readable stream: throwing strategy.highWaterMark getter
</span><span class="cx"> PASS Readable stream: invalid strategy.highWaterMark
</span><span class="cx"> PASS Readable stream: negative strategy.highWaterMark
</span><del>-PASS Readable stream: strategy.size returning NaN
-PASS Readable stream: strategy.size returning -Infinity
-PASS Readable stream: strategy.size returning +Infinity
</del><ins>+PASS Readable stream: invalid strategy.size return value
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationbadstrategieshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/bad-strategies.html (186111 => 186112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/bad-strategies.html 2015-06-30 07:50:12 UTC (rev 186111)
+++ trunk/LayoutTests/streams/reference-implementation/bad-strategies.html 2015-06-30 09:27:49 UTC (rev 186112)
</span><span class="lines">@@ -88,99 +88,38 @@
</span><span class="cx"> }, 'construction should throw a RangeError');
</span><span class="cx"> }, 'Readable stream: negative strategy.highWaterMark');
</span><span class="cx">
</span><del>-var test2 = async_test('Readable stream: strategy.size returning NaN');
</del><ins>+var test2 = async_test('Readable stream: invalid strategy.size return value');
</ins><span class="cx"> test2.step(function() {
</span><del>- var theError;
- var startCalled = false;
- var rs = new ReadableStream(
- {
</del><ins>+ var numberOfCalls = 0;
+ var elements = [NaN, -Infinity, +Infinity, -1];
+ var theError = [];
+ for (var i = 0; i < elements.length; i++) {
+ var rs = new ReadableStream({
</ins><span class="cx"> start: function(c) {
</span><span class="cx"> try {
</span><span class="cx"> c.enqueue('hi');
</span><span class="cx"> assert_unreached('enqueue didn\'t throw');
</span><span class="cx"> } catch (error) {
</span><del>- startCalled = true;
- assert_equals(error.constructor, RangeError, 'enqueue should throw a RangeError');
- theError = error;
</del><ins>+ assert_throws(new RangeError(), function() { throw error; }, 'enqueue should throw a RangeError for ' + elements[i]);
+ theError[i] = error;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> size: function() {
</span><del>- return NaN;
</del><ins>+ return elements[i];
</ins><span class="cx"> },
</span><span class="cx"> highWaterMark: 5
</span><del>- }
- );
</del><ins>+ });
</ins><span class="cx">
</span><del>- rs.getReader().closed.catch(test2.step_func(function(e) {
- assert_equals(e, theError, 'closed should reject with the error');
- assert_true(startCalled);
- test2.done();
- }));
-});
-
-var test3 = async_test('Readable stream: strategy.size returning -Infinity');
-test3.step(function() {
- var theError;
- var startCalled = false;
- var rs = new ReadableStream(
- {
- start: function(c) {
- try {
- c.enqueue('hi');
- assert_unreached('enqueue didn\'t throw');
- } catch (error) {
- startCalled = true;
- assert_equals(error.constructor, RangeError, 'enqueue should throw a RangeError');
- theError = error;
- }
</del><ins>+ var catchFunction = function(i, e) {
+ assert_equals(e, theError[i], 'closed should reject with the error for ' + elements[i]);
+ if (++numberOfCalls, elements.length) {
+ test2.done();
</ins><span class="cx"> }
</span><del>- },
- {
- size: function() {
- return -Infinity;
- },
- highWaterMark: 5
- }
- );
</del><ins>+ };
</ins><span class="cx">
</span><del>- rs.getReader().closed.catch(test3.step_func(function(e) {
- assert_equals(e, theError, 'closed should reject with the error');
- assert_true(startCalled);
- test3.done();
- }));
</del><ins>+ rs.getReader().closed.catch(test2.step_func(catchFunction.bind(this, i)));
+ }
</ins><span class="cx"> });
</span><del>-
-var test4 = async_test('Readable stream: strategy.size returning +Infinity');
-test4.step(function() {
- var theError;
- var startCalled = false;
- var rs = new ReadableStream(
- {
- start: function(c) {
- try {
- c.enqueue('hi');
- assert_unreached('enqueue didn\'t throw');
- } catch (error) {
- startCalled = true;
- assert_equals(error.constructor, RangeError, 'enqueue should throw a RangeError');
- theError = error;
- }
- }
- },
- {
- size: function() {
- return +Infinity;
- },
- highWaterMark: 5
- }
- );
-
- rs.getReader().closed.catch(test4.step_func(function(e) {
- assert_equals(e, theError, 'closed should reject with the error');
- assert_true(startCalled);
- test4.done();
- }));
-});
</del><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186111 => 186112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-30 07:50:12 UTC (rev 186111)
+++ trunk/Source/WebCore/ChangeLog 2015-06-30 09:27:49 UTC (rev 186112)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-30 Youenn Fablet <youenn.fablet@crf.canon.fr> and Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] Synced bad strategy test with reference implementation
+ https://bugs.webkit.org/show_bug.cgi?id=146411
+
+ Reviewed by Darin Adler.
+
+ Current tests cover the case.
+
+ * bindings/js/ReadableJSStream.cpp:
+ (WebCore::ReadableJSStream::retrieveChunkSize): Check for negative size then running the JavaScript function.
+
</ins><span class="cx"> 2015-06-30 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] Remove ReadableStream.getReader() custom binding
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableJSStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp (186111 => 186112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp 2015-06-30 07:50:12 UTC (rev 186111)
+++ trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp 2015-06-30 09:27:49 UTC (rev 186112)
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx"> if (state.hadException())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- if (!std::isfinite(size)) {
</del><ins>+ if (!std::isfinite(size) || size < 0) {
</ins><span class="cx"> throwVMError(&state, createRangeError(&state, ASCIILiteral("Incorrect double value")));
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>