<!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>[186414] 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/186414">186414</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-07-07 01:00:22 -0700 (Tue, 07 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore:
[Streams API] Remove ReadableStreamReader.read() custom binding
https://bugs.webkit.org/show_bug.cgi?id=146643
Reviewed by Darin Adler.
Moved ReadableStreamReader.read handling from callbacks to promises.
Introduced DOMPromiseIteratorWithCallback for that purpose: it takes resolve() to resolve a promise with a not-ending iterator value,
resolveEnd() to resolve a promise with a terminating iterator value and reject().
Added template helper routine to convert typed values to JS iterator wrapping the value.
Removed ReadableStreamReader.read custom binding.
Covered by rebased tests.
* Modules/streams/ReadableStream.cpp: Updated code to use DOMPromiseIteratorWithCallback API.
(WebCore::ReadableStream::releaseReader):
(WebCore::ReadableStream::changeStateToErrored):
(WebCore::ReadableStream::read):
(WebCore::ReadableStream::resolveReadCallback):
* Modules/streams/ReadableStream.h:
* Modules/streams/ReadableStreamReader.cpp:
(WebCore::ReadableStreamReader::read):
* Modules/streams/ReadableStreamReader.h:
* Modules/streams/ReadableStreamReader.idl: Removed custom binding.
* bindings/js/JSDOMBinding.h:
(WebCore::toJSIterator): create JS iterator from typed value.
(WebCore::toJSIteratorEnd): create JS end iterator.
* bindings/js/JSDOMPromise.cpp:
(WebCore::DeferredWrapper::globalObject): Added globaObject getter and removed promise getter.
* bindings/js/JSDOMPromise.h:
(WebCore::DOMPromiseIteratorWithCallback::DOMPromiseIteratorWithCallback):
(WebCore::Error>::resolve):
(WebCore::Error>::resolveEnd):
(WebCore::Error>::reject):
* bindings/js/JSReadableStreamReaderCustom.cpp: Removed custom binding.
LayoutTests:
[Streams API] Remove ReadableStreamStream.read() custom binding
https://bugs.webkit.org/show_bug.cgi?id=146643
Reviewed by Darin Adler.
* streams/reference-implementation/brand-checks-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationbrandchecksexpectedtxt">trunk/LayoutTests/streams/reference-implementation/brand-checks-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamcpp">trunk/Source/WebCore/Modules/streams/ReadableStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamh">trunk/Source/WebCore/Modules/streams/ReadableStream.h</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamReadercpp">trunk/Source/WebCore/Modules/streams/ReadableStreamReader.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamReaderh">trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamReaderidl">trunk/Source/WebCore/Modules/streams/ReadableStreamReader.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingh">trunk/Source/WebCore/bindings/js/JSDOMBinding.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMPromisecpp">trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMPromiseh">trunk/Source/WebCore/bindings/js/JSDOMPromise.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSReadableStreamReaderCustomcpp">trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186413 => 186414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-07 07:55:50 UTC (rev 186413)
+++ trunk/LayoutTests/ChangeLog 2015-07-07 08:00:22 UTC (rev 186414)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-07-07 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Streams API] Remove ReadableStreamStream.read() custom binding
+ https://bugs.webkit.org/show_bug.cgi?id=146643
+
+ Reviewed by Darin Adler.
+
+ * streams/reference-implementation/brand-checks-expected.txt:
+
</ins><span class="cx"> 2015-07-06 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Slider thumb does not render properly (image tests with <input type="range">)
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationbrandchecksexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/brand-checks-expected.txt (186413 => 186414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/brand-checks-expected.txt 2015-07-07 07:55:50 UTC (rev 186413)
+++ trunk/LayoutTests/streams/reference-implementation/brand-checks-expected.txt 2015-07-07 08:00:22 UTC (rev 186414)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx"> PASS ReadableStreamReader enforces a brand check on its argument
</span><span class="cx"> FAIL ReadableStreamReader.prototype.closed enforces a brand check undefined is not an object (evaluating 'Object.getOwnPropertyDescriptor(obj, getterName).get')
</span><span class="cx"> PASS ReadableStreamReader.prototype.cancel enforces a brand check
</span><del>-FAIL ReadableStreamReader.prototype.read enforces a brand check Can only call ReadableStreamReader.read on instances of ReadableStreamReader
-FAIL ReadableStreamReader.prototype.read enforces a brand check Can only call ReadableStreamReader.read on instances of ReadableStreamReader
</del><ins>+PASS ReadableStreamReader.prototype.read enforces a brand check
+PASS ReadableStreamReader.prototype.read enforces a brand check
</ins><span class="cx"> PASS ReadableStreamReader.prototype.releaseLock enforces a brand check
</span><span class="cx"> PASS ReadableStreamController enforces a brand check on its argument
</span><span class="cx"> PASS ReadableStreamController can't be given a fully-constructed ReadableStream
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186413 => 186414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-07 07:55:50 UTC (rev 186413)
+++ trunk/Source/WebCore/ChangeLog 2015-07-07 08:00:22 UTC (rev 186414)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-07-07 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Streams API] Remove ReadableStreamReader.read() custom binding
+ https://bugs.webkit.org/show_bug.cgi?id=146643
+
+ Reviewed by Darin Adler.
+
+ Moved ReadableStreamReader.read handling from callbacks to promises.
+ Introduced DOMPromiseIteratorWithCallback for that purpose: it takes resolve() to resolve a promise with a not-ending iterator value,
+ resolveEnd() to resolve a promise with a terminating iterator value and reject().
+ Added template helper routine to convert typed values to JS iterator wrapping the value.
+ Removed ReadableStreamReader.read custom binding.
+
+ Covered by rebased tests.
+
+ * Modules/streams/ReadableStream.cpp: Updated code to use DOMPromiseIteratorWithCallback API.
+ (WebCore::ReadableStream::releaseReader):
+ (WebCore::ReadableStream::changeStateToErrored):
+ (WebCore::ReadableStream::read):
+ (WebCore::ReadableStream::resolveReadCallback):
+ * Modules/streams/ReadableStream.h:
+ * Modules/streams/ReadableStreamReader.cpp:
+ (WebCore::ReadableStreamReader::read):
+ * Modules/streams/ReadableStreamReader.h:
+ * Modules/streams/ReadableStreamReader.idl: Removed custom binding.
+ * bindings/js/JSDOMBinding.h:
+ (WebCore::toJSIterator): create JS iterator from typed value.
+ (WebCore::toJSIteratorEnd): create JS end iterator.
+ * bindings/js/JSDOMPromise.cpp:
+ (WebCore::DeferredWrapper::globalObject): Added globaObject getter and removed promise getter.
+ * bindings/js/JSDOMPromise.h:
+ (WebCore::DOMPromiseIteratorWithCallback::DOMPromiseIteratorWithCallback):
+ (WebCore::Error>::resolve):
+ (WebCore::Error>::resolveEnd):
+ (WebCore::Error>::reject):
+ * bindings/js/JSReadableStreamReaderCustom.cpp: Removed custom binding.
+
</ins><span class="cx"> 2015-07-06 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Slider thumb does not render properly (image tests with <input type="range">)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.cpp (186413 => 186414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.cpp 2015-07-07 07:55:50 UTC (rev 186413)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.cpp 2015-07-07 08:00:22 UTC (rev 186414)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> m_closedPromise.value().resolve(nullptr);
</span><span class="cx">
</span><span class="cx"> for (auto& request : m_readRequests)
</span><del>- request.endCallback();
</del><ins>+ request.resolveEnd();
</ins><span class="cx">
</span><span class="cx"> clearCallbacks();
</span><span class="cx"> if (m_reader)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> m_closedPromise.value().reject(error);
</span><span class="cx">
</span><span class="cx"> for (auto& request : m_readRequests)
</span><del>- request.failureCallback(error);
</del><ins>+ request.reject(error);
</ins><span class="cx">
</span><span class="cx"> clearCallbacks();
</span><span class="cx"> if (m_reader)
</span><span class="lines">@@ -236,25 +236,25 @@
</span><span class="cx"> m_closedPromise = WTF::move(promise);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ReadableStream::read(ReadSuccessCallback&& successCallback, ReadEndCallback&& endCallback, FailureCallback&& failureCallback)
</del><ins>+void ReadableStream::read(ReadPromise&& readPromise)
</ins><span class="cx"> {
</span><span class="cx"> if (m_state == State::Closed) {
</span><del>- endCallback();
</del><ins>+ readPromise.resolveEnd();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (m_state == State::Errored) {
</span><del>- failureCallback(error());
</del><ins>+ readPromise.reject(error());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (hasValue()) {
</span><del>- successCallback(read());
</del><ins>+ readPromise.resolve(read());
</ins><span class="cx"> if (!m_closeRequested)
</span><span class="cx"> pull();
</span><span class="cx"> else if (!hasValue())
</span><span class="cx"> close();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- m_readRequests.append({ WTF::move(successCallback), WTF::move(endCallback), WTF::move(failureCallback) });
</del><ins>+ m_readRequests.append(WTF::move(readPromise));
</ins><span class="cx"> pull();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> if (m_readRequests.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- m_readRequests.takeFirst().successCallback(value);
</del><ins>+ m_readRequests.takeFirst().resolve(value);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.h (186413 => 186414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.h 2015-07-07 07:55:50 UTC (rev 186413)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.h 2015-07-07 08:00:22 UTC (rev 186414)
</span><span class="lines">@@ -89,8 +89,6 @@
</span><span class="cx"> void notifyCancelSucceeded();
</span><span class="cx"> void notifyCancelFailed();
</span><span class="cx">
</span><del>- typedef std::function<void(JSC::JSValue)> FailureCallback;
-
</del><span class="cx"> typedef DOMPromise<std::nullptr_t, JSC::JSValue> CancelPromise;
</span><span class="cx"> void cancel(JSC::JSValue, CancelPromise&&, ExceptionCode&);
</span><span class="cx"> void cancelNoCheck(JSC::JSValue, CancelPromise&&);
</span><span class="lines">@@ -98,9 +96,8 @@
</span><span class="cx"> typedef DOMPromise<std::nullptr_t, JSC::JSValue> ClosedPromise;
</span><span class="cx"> void closed(ClosedPromise&&);
</span><span class="cx">
</span><del>- typedef std::function<void(JSC::JSValue)> ReadSuccessCallback;
- typedef std::function<void()> ReadEndCallback;
- void read(ReadSuccessCallback&&, ReadEndCallback&&, FailureCallback&&);
</del><ins>+ typedef DOMPromiseIteratorWithCallback<JSC::JSValue, JSC::JSValue> ReadPromise;
+ void read(ReadPromise&&);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> explicit ReadableStream(ScriptExecutionContext&);
</span><span class="lines">@@ -128,12 +125,7 @@
</span><span class="cx"> Optional<CancelPromise> m_cancelPromise;
</span><span class="cx"> Optional<ClosedPromise> m_closedPromise;
</span><span class="cx">
</span><del>- struct ReadCallbacks {
- ReadSuccessCallback successCallback;
- ReadEndCallback endCallback;
- FailureCallback failureCallback;
- };
- Deque<ReadCallbacks> m_readRequests;
</del><ins>+ Deque<ReadPromise> m_readRequests;
</ins><span class="cx">
</span><span class="cx"> bool m_isStarted { false };
</span><span class="cx"> bool m_isPulling { false };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamReadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamReader.cpp (186413 => 186414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.cpp 2015-07-07 07:55:50 UTC (rev 186413)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.cpp 2015-07-07 08:00:22 UTC (rev 186414)
</span><span class="lines">@@ -55,13 +55,13 @@
</span><span class="cx"> m_stream.closed(WTF::move(promise));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ReadableStreamReader::read(ReadableStream::ReadSuccessCallback&& successCallback, ReadableStream::ReadEndCallback&& endCallback, ReadableStream::FailureCallback&& failureCallback)
</del><ins>+void ReadableStreamReader::read(ReadableStream::ReadPromise&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (m_stream.isReadable() && m_stream.reader() != this) {
</span><del>- endCallback();
</del><ins>+ promise.resolveEnd();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- m_stream.read(WTF::move(successCallback), WTF::move(endCallback), WTF::move(failureCallback));
</del><ins>+ m_stream.read(WTF::move(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ReadableStreamReader::releaseLock(ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamReaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h (186413 => 186414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h 2015-07-07 07:55:50 UTC (rev 186413)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h 2015-07-07 08:00:22 UTC (rev 186414)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> void cancel(JSC::JSValue, ReadableStream::CancelPromise&&);
</span><span class="cx"> void closed(ReadableStream::ClosedPromise&&);
</span><del>- void read(ReadableStream::ReadSuccessCallback&&, ReadableStream::ReadEndCallback&&, ReadableStream::FailureCallback&&);
</del><ins>+ void read(ReadableStream::ReadPromise&&);
</ins><span class="cx"> void releaseLock(ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> void ref() { m_stream.ref(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamReaderidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamReader.idl (186413 => 186414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.idl 2015-07-07 07:55:50 UTC (rev 186413)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.idl 2015-07-07 08:00:22 UTC (rev 186414)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> NoInterfaceObject,
</span><span class="cx"> SkipVTableValidation
</span><span class="cx"> ] interface ReadableStreamReader {
</span><del>- [Custom] Object read();
</del><ins>+ Promise read();
</ins><span class="cx"> Promise cancel([Default=Undefined] optional any reason);
</span><span class="cx"> [RaisesException] void releaseLock();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (186413 => 186414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2015-07-07 07:55:50 UTC (rev 186413)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2015-07-07 08:00:22 UTC (rev 186414)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include <heap/Weak.h>
</span><span class="cx"> #include <heap/WeakInlines.h>
</span><span class="cx"> #include <runtime/Error.h>
</span><ins>+#include <runtime/IteratorOperations.h>
</ins><span class="cx"> #include <runtime/JSArray.h>
</span><span class="cx"> #include <runtime/JSArrayBuffer.h>
</span><span class="cx"> #include <runtime/JSCJSValueInlines.h>
</span><span class="lines">@@ -396,6 +397,21 @@
</span><span class="cx"> return jsStringOrNull(exec, value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline JSC::JSValue toJSIterator(JSC::ExecState& state, JSDOMGlobalObject&, JSC::JSValue value)
+{
+ return createIteratorResultObject(&state, value, false);
+}
+
+template<typename T> inline JSC::JSValue toJSIterator(JSC::ExecState& state, JSDOMGlobalObject& globalObject, const T& value)
+{
+ return createIteratorResultObject(&state, toJS(&state, &globalObject, value), false);
+}
+
+inline JSC::JSValue toJSIteratorEnd(JSC::ExecState& state)
+{
+ return createIteratorResultObject(&state, JSC::jsUndefined(), true);
+}
+
</ins><span class="cx"> template<typename T> struct JSValueTraits {
</span><span class="cx"> static JSC::JSValue arrayJSValue(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const T& value)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromisecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp (186413 => 186414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp 2015-07-07 07:55:50 UTC (rev 186413)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp 2015-07-07 08:00:22 UTC (rev 186414)
</span><span class="lines">@@ -41,12 +41,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSObject* DeferredWrapper::promise() const
</del><ins>+JSDOMGlobalObject& DeferredWrapper::globalObject() const
</ins><span class="cx"> {
</span><del>- // FIXME: Remove this accessor once ReadableStreamReader custom binding does not need it.
- ASSERT(m_deferred);
- return m_deferred->promise();
-}
</del><ins>+ ASSERT(m_globalObject);
+ return *m_globalObject.get();
+}
</ins><span class="cx">
</span><span class="cx"> void DeferredWrapper::callFunction(ExecState& exec, JSValue function, JSValue resolution)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromiseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.h (186413 => 186414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2015-07-07 07:55:50 UTC (rev 186413)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2015-07-07 08:00:22 UTC (rev 186414)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> template<class RejectResultType>
</span><span class="cx"> void reject(const RejectResultType&);
</span><span class="cx">
</span><del>- JSC::JSObject* promise() const;
</del><ins>+ JSDOMGlobalObject& globalObject() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void callFunction(JSC::ExecState&, JSC::JSValue function, JSC::JSValue resolution);
</span><span class="lines">@@ -96,10 +96,6 @@
</span><span class="cx"> ASSERT(m_resolveCallback);
</span><span class="cx"> ASSERT(m_rejectCallback);
</span><span class="cx"> }
</span><del>- explicit DOMPromiseWithCallback(DOMPromiseWithCallback&& promise)
- : m_wrapper(WTF::move(promise.m_wrapper))
- , m_resolveCallback(WTF::move(promise.m_resolveCallback))
- , m_rejectCallback(WTF::move(promise.m_rejectCallback)) { }
</del><span class="cx">
</span><span class="cx"> void resolve(const Value&);
</span><span class="cx"> void reject(const Error&);
</span><span class="lines">@@ -110,6 +106,31 @@
</span><span class="cx"> std::function<void(const Error&)> m_rejectCallback;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<typename Value, typename Error>
+class DOMPromiseIteratorWithCallback {
+public:
+ DOMPromiseIteratorWithCallback(DeferredWrapper&& wrapper) : m_wrapper(WTF::move(wrapper)) { }
+ DOMPromiseIteratorWithCallback(std::function<void(const Value&)> resolve, std::function<void()> resolveEnd, std::function<void(const Error&)> reject)
+ : m_resolveCallback(WTF::move(resolve))
+ , m_resolveEndCallback(WTF::move(resolveEnd))
+ , m_rejectCallback(WTF::move(reject))
+ {
+ ASSERT(m_resolveCallback);
+ ASSERT(m_resolveEndCallback);
+ ASSERT(m_rejectCallback);
+ }
+
+ void resolve(const Value&);
+ void resolveEnd();
+ void reject(const Error&);
+
+private:
+ Optional<DeferredWrapper> m_wrapper;
+ std::function<void(const Value&)> m_resolveCallback;
+ std::function<void()> m_resolveEndCallback;
+ std::function<void(const Error&)> m_rejectCallback;
+};
+
</ins><span class="cx"> template<class ResolveResultType>
</span><span class="cx"> inline void DeferredWrapper::resolve(const ResolveResultType& result)
</span><span class="cx"> {
</span><span class="lines">@@ -227,7 +248,6 @@
</span><span class="cx"> m_resolveCallback(value);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- ASSERT(m_wrapper);
</del><span class="cx"> m_wrapper.value().resolve(value);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -238,12 +258,42 @@
</span><span class="cx"> m_rejectCallback(error);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- ASSERT(m_wrapper);
</del><span class="cx"> m_wrapper.value().reject(error);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename Value, typename Error>
+inline void DOMPromiseIteratorWithCallback<Value, Error>::resolve(const Value& value)
+{
+ if (m_resolveCallback) {
+ m_resolveCallback(value);
+ return;
+ }
+ JSDOMGlobalObject& globalObject = m_wrapper.value().globalObject();
+ m_wrapper.value().resolve(toJSIterator(*globalObject.globalExec(), globalObject, value));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename Value, typename Error>
+inline void DOMPromiseIteratorWithCallback<Value, Error>::resolveEnd()
+{
+ if (m_resolveEndCallback) {
+ m_resolveEndCallback();
+ return;
+ }
+ m_wrapper.value().resolve(toJSIteratorEnd(*m_wrapper.value().globalObject().globalExec()));
+}
+
+template<typename Value, typename Error>
+inline void DOMPromiseIteratorWithCallback<Value, Error>::reject(const Error& error)
+{
+ if (m_rejectCallback) {
+ m_rejectCallback(error);
+ return;
+ }
+ m_wrapper.value().reject(error);
+}
+
+}
+
</ins><span class="cx"> #endif // ENABLE(PROMISES)
</span><span class="cx">
</span><span class="cx"> #endif // JSDOMPromise_h
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSReadableStreamReaderCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp (186413 => 186414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp 2015-07-07 07:55:50 UTC (rev 186413)
+++ trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp 2015-07-07 08:00:22 UTC (rev 186414)
</span><span class="lines">@@ -44,28 +44,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-JSValue JSReadableStreamReader::read(ExecState* exec)
-{
- JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(exec, globalObject());
- DeferredWrapper wrapper(exec, globalObject(), promiseDeferred);
-
- auto successCallback = [wrapper](JSValue value) mutable {
- JSValue result = createIteratorResultObject(wrapper.promise()->globalObject()->globalExec(), value, false);
- wrapper.resolve(result);
- };
- auto endCallback = [wrapper]() mutable {
- JSValue result = createIteratorResultObject(wrapper.promise()->globalObject()->globalExec(), JSC::jsUndefined(), true);
- wrapper.resolve(result);
- };
- auto failureCallback = [wrapper](JSValue value) mutable {
- wrapper.reject(value);
- };
-
- impl().read(WTF::move(successCallback), WTF::move(endCallback), WTF::move(failureCallback));
-
- return promiseDeferred->promise();
-}
-
</del><span class="cx"> JSValue JSReadableStreamReader::closed(ExecState* exec) const
</span><span class="cx"> {
</span><span class="cx"> if (m_closedPromiseDeferred)
</span></span></pre>
</div>
</div>
</body>
</html>