<!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>[185592] 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/185592">185592</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-06-16 10:36:08 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Calling controller.error() should trigger storing an undefined error
https://bugs.webkit.org/show_bug.cgi?id=145976
Reviewed by Darin Adler.
Source/WebCore:
Covered by rebased test.
* bindings/js/JSReadableStreamControllerCustom.cpp:
(WebCore::JSReadableStreamController::error): Storing undefined if no error value passed.
* bindings/js/ReadableJSStream.cpp: Removed storeError(ExecState*).
(WebCore::ReadableJSStream::ReadableJSStream):
LayoutTests:
* streams/readable-stream-controller-error-expected.txt: Rebasing expectation as test is passing now.
* streams/readable-stream-reader-read-expected.txt:
* streams/readable-stream-reader-read.html: Adding test for promise rejection without any parameter.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstreamsreadablestreamcontrollererrorexpectedtxt">trunk/LayoutTests/streams/readable-stream-controller-error-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsreadablestreamreaderreadexpectedtxt">trunk/LayoutTests/streams/readable-stream-reader-read-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsreadablestreamreaderreadhtml">trunk/LayoutTests/streams/readable-stream-reader-read.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSReadableStreamControllerCustomcpp">trunk/Source/WebCore/bindings/js/JSReadableStreamControllerCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableJSStreamcpp">trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableJSStreamh">trunk/Source/WebCore/bindings/js/ReadableJSStream.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185591 => 185592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-16 15:45:57 UTC (rev 185591)
+++ trunk/LayoutTests/ChangeLog 2015-06-16 17:36:08 UTC (rev 185592)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-06-16 Youenn Fablet <youenn.fablet@crf.canon.fr> and Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><ins>+ [Streams API] Calling controller.error() should trigger storing an undefined error
+ https://bugs.webkit.org/show_bug.cgi?id=145976
+
+ Reviewed by Darin Adler.
+
+ * streams/readable-stream-controller-error-expected.txt: Rebasing expectation as test is passing now.
+ * streams/readable-stream-reader-read-expected.txt:
+ * streams/readable-stream-reader-read.html: Adding test for promise rejection without any parameter.
+
+2015-06-16 Youenn Fablet <youenn.fablet@crf.canon.fr> and Xabier Rodriguez Calvar <calvaris@igalia.com>
+
</ins><span class="cx"> [Streams API] Sync tests with spec
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145839
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreadablestreamcontrollererrorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/readable-stream-controller-error-expected.txt (185591 => 185592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/readable-stream-controller-error-expected.txt 2015-06-16 15:45:57 UTC (rev 185591)
+++ trunk/LayoutTests/streams/readable-stream-controller-error-expected.txt 2015-06-16 17:36:08 UTC (rev 185592)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx">
</span><span class="cx"> PASS Erroring a ReadableStream should reject ReadableStreamReader close promise
</span><span class="cx"> PASS Erroring a ReadableStream should reject ReadableStreamReader close promise
</span><del>-FAIL Erroring a ReadableStream without any value assert_equals: expected (undefined) undefined but got (object) object "Error: Error function called."
</del><ins>+PASS Erroring a ReadableStream without any value
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreadablestreamreaderreadexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/readable-stream-reader-read-expected.txt (185591 => 185592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/readable-stream-reader-read-expected.txt 2015-06-16 15:45:57 UTC (rev 185591)
+++ trunk/LayoutTests/streams/readable-stream-reader-read-expected.txt 2015-06-16 17:36:08 UTC (rev 185592)
</span><span class="lines">@@ -4,4 +4,5 @@
</span><span class="cx"> PASS Reading twice on an errored stream
</span><span class="cx"> PASS Reading twice on a stream that gets errored
</span><span class="cx"> PASS Reading within a read promise resolve callback on a stream that gets closed
</span><ins>+PASS ReadableStream: if start rejects with no parameter, it should error the stream with an undefined error
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreadablestreamreaderreadhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/readable-stream-reader-read.html (185591 => 185592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/readable-stream-reader-read.html 2015-06-16 15:45:57 UTC (rev 185591)
+++ trunk/LayoutTests/streams/readable-stream-reader-read.html 2015-06-16 17:36:08 UTC (rev 185592)
</span><span class="lines">@@ -159,4 +159,19 @@
</span><span class="cx"> }));
</span><span class="cx"> controller.close();
</span><span class="cx"> });
</span><ins>+
+var test6 = async_test('ReadableStream: if start rejects with no parameter, it should error the stream with an undefined error');
+test6.step(function() {
+ var rs = new ReadableStream({
+ start: function(c) {
+ return Promise.reject();
+ }
+ });
+
+ rs.getReader().read().catch(test6.step_func(function(e) {
+ assert_equals(typeof e, "undefined");
+ test6.done();
+ }));
+});
+
</ins><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185591 => 185592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-16 15:45:57 UTC (rev 185591)
+++ trunk/Source/WebCore/ChangeLog 2015-06-16 17:36:08 UTC (rev 185592)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-16 Youenn Fablet <youenn.fablet@crf.canon.fr> and Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] Calling controller.error() should trigger storing an undefined error
+ https://bugs.webkit.org/show_bug.cgi?id=145976
+
+ Reviewed by Darin Adler.
+
+ Covered by rebased test.
+
+ * bindings/js/JSReadableStreamControllerCustom.cpp:
+ (WebCore::JSReadableStreamController::error): Storing undefined if no error value passed.
+ * bindings/js/ReadableJSStream.cpp: Removed storeError(ExecState*).
+ (WebCore::ReadableJSStream::ReadableJSStream):
+
</ins><span class="cx"> 2015-06-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Purge StyledElement's presentation attribute cache on memory pressure
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSReadableStreamControllerCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamControllerCustom.cpp (185591 => 185592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSReadableStreamControllerCustom.cpp 2015-06-16 15:45:57 UTC (rev 185591)
+++ trunk/Source/WebCore/bindings/js/JSReadableStreamControllerCustom.cpp 2015-06-16 17:36:08 UTC (rev 185592)
</span><span class="lines">@@ -61,12 +61,12 @@
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSReadableStreamController::error(ExecState* exec)
</del><ins>+JSValue JSReadableStreamController::error(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> ReadableJSStream& stream = impl().stream();
</span><span class="cx"> if (!stream.isReadable())
</span><del>- return exec->vm().throwException(exec, createTypeError(exec, ASCIILiteral("Calling error on a stream which is not readable")));
- stream.storeError(*exec);
</del><ins>+ return state->vm().throwException(state, createTypeError(state, ASCIILiteral("Calling error on a stream which is not readable")));
+ stream.storeError(*state, state->argument(0));
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableJSStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp (185591 => 185592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp 2015-06-16 15:45:57 UTC (rev 185591)
+++ trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp 2015-06-16 17:36:08 UTC (rev 185592)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> // We do not take a Ref to the stream as this would cause a Ref cycle.
</span><span class="cx"> // The resolution callback used jointly with m_errorFunction as promise callbacks should protect the stream instead.
</span><span class="cx"> m_errorFunction.set(state.vm(), JSFunction::create(state.vm(), state.callee()->globalObject(), 1, String(), [this](ExecState* state) {
</span><del>- storeError(*state);
</del><ins>+ storeError(*state, state->argument(0));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }));
</span><span class="cx"> }
</span><span class="lines">@@ -195,11 +195,6 @@
</span><span class="cx"> storeError(state, exception);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ReadableJSStream::storeError(JSC::ExecState& exec)
-{
- storeError(exec, exec.argumentCount() ? exec.argument(0) : createError(&exec, ASCIILiteral("Error function called.")));
-}
-
</del><span class="cx"> void ReadableJSStream::storeError(JSC::ExecState& exec, JSValue error)
</span><span class="cx"> {
</span><span class="cx"> if (m_error)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableJSStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableJSStream.h (185591 => 185592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableJSStream.h 2015-06-16 15:45:57 UTC (rev 185591)
+++ trunk/Source/WebCore/bindings/js/ReadableJSStream.h 2015-06-16 17:36:08 UTC (rev 185592)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSValue jsController(JSC::ExecState&, JSDOMGlobalObject*);
</span><span class="cx">
</span><del>- void storeError(JSC::ExecState&);
</del><ins>+ void storeError(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx"> JSC::JSValue error() override { return m_error.get(); }
</span><span class="cx">
</span><span class="cx"> void enqueue(JSC::ExecState&);
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSPromise* invoke(JSC::ExecState&, const char*);
</span><span class="cx"> void storeException(JSC::ExecState&);
</span><del>- void storeError(JSC::ExecState&, JSC::JSValue);
</del><span class="cx">
</span><span class="cx"> virtual bool hasValue() const override;
</span><span class="cx"> virtual JSC::JSValue read() override;
</span></span></pre>
</div>
</div>
</body>
</html>