<!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>[186109] trunk/Source/WebCore</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/186109">186109</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-06-29 23:47:19 -0700 (Mon, 29 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] ReadableStreamReader.closed should use DOMPromise
https://bugs.webkit.org/show_bug.cgi?id=146406
Reviewed by Darin Adler.
Added storage of ClosedPromise as Optional of ReadableStream.
Updated code accordingly.
Covered by existing tests.
* Modules/streams/ReadableStream.cpp:
(WebCore::ReadableStream::clearCallbacks):
(WebCore::ReadableStream::releaseReader):
(WebCore::ReadableStream::changeStateToErrored):
(WebCore::ReadableStream::closed):
* Modules/streams/ReadableStream.h:
* Modules/streams/ReadableStreamReader.cpp:
(WebCore::ReadableStreamReader::closed):
* Modules/streams/ReadableStreamReader.h:
* bindings/js/JSReadableStreamReaderCustom.cpp:
(WebCore::JSReadableStreamReader::closed):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCorebindingsjsJSReadableStreamReaderCustomcpp">trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186108 => 186109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-30 06:02:24 UTC (rev 186108)
+++ trunk/Source/WebCore/ChangeLog 2015-06-30 06:47:19 UTC (rev 186109)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-06-29 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Streams API] ReadableStreamReader.closed should use DOMPromise
+ https://bugs.webkit.org/show_bug.cgi?id=146406
+
+ Reviewed by Darin Adler.
+
+ Added storage of ClosedPromise as Optional of ReadableStream.
+ Updated code accordingly.
+
+ Covered by existing tests.
+
+ * Modules/streams/ReadableStream.cpp:
+ (WebCore::ReadableStream::clearCallbacks):
+ (WebCore::ReadableStream::releaseReader):
+ (WebCore::ReadableStream::changeStateToErrored):
+ (WebCore::ReadableStream::closed):
+ * Modules/streams/ReadableStream.h:
+ * Modules/streams/ReadableStreamReader.cpp:
+ (WebCore::ReadableStreamReader::closed):
+ * Modules/streams/ReadableStreamReader.h:
+ * bindings/js/JSReadableStreamReaderCustom.cpp:
+ (WebCore::JSReadableStreamReader::closed):
+
</ins><span class="cx"> 2015-06-29 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] WKWebViews in Facebook app start off black
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.cpp (186108 => 186109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.cpp 2015-06-30 06:02:24 UTC (rev 186108)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.cpp 2015-06-30 06:47:19 UTC (rev 186109)
</span><span class="lines">@@ -59,9 +59,7 @@
</span><span class="cx">
</span><span class="cx"> void ReadableStream::clearCallbacks()
</span><span class="cx"> {
</span><del>- m_closedSuccessCallback = nullptr;
- m_closedFailureCallback = nullptr;
-
</del><ins>+ m_closedPromise = Nullopt;
</ins><span class="cx"> m_readRequests.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -85,8 +83,8 @@
</span><span class="cx">
</span><span class="cx"> void ReadableStream::releaseReader()
</span><span class="cx"> {
</span><del>- if (m_closedSuccessCallback)
- m_closedSuccessCallback();
</del><ins>+ if (m_closedPromise)
+ m_closedPromise.value().resolve(nullptr);
</ins><span class="cx">
</span><span class="cx"> for (auto& request : m_readRequests)
</span><span class="cx"> request.endCallback();
</span><span class="lines">@@ -103,8 +101,8 @@
</span><span class="cx"> m_state = State::Errored;
</span><span class="cx">
</span><span class="cx"> JSC::JSValue error = this->error();
</span><del>- if (m_closedFailureCallback)
- m_closedFailureCallback(error);
</del><ins>+ if (m_closedPromise)
+ m_closedPromise.value().reject(error);
</ins><span class="cx">
</span><span class="cx"> for (auto& request : m_readRequests)
</span><span class="cx"> request.failureCallback(error);
</span><span class="lines">@@ -210,18 +208,17 @@
</span><span class="cx"> m_cancelPromise = Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ReadableStream::closed(ClosedSuccessCallback&& successCallback, FailureCallback&& failureCallback)
</del><ins>+void ReadableStream::closed(ClosedPromise&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (m_state == State::Closed) {
</span><del>- successCallback();
</del><ins>+ promise.resolve(nullptr);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (m_state == State::Errored) {
</span><del>- failureCallback(error());
</del><ins>+ promise.reject(error());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- m_closedSuccessCallback = WTF::move(successCallback);
- m_closedFailureCallback = WTF::move(failureCallback);
</del><ins>+ m_closedPromise = WTF::move(promise);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ReadableStream::read(ReadSuccessCallback&& successCallback, ReadEndCallback&& endCallback, FailureCallback&& failureCallback)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.h (186108 => 186109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.h 2015-06-30 06:02:24 UTC (rev 186108)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.h 2015-06-30 06:47:19 UTC (rev 186109)
</span><span class="lines">@@ -93,8 +93,8 @@
</span><span class="cx"> void cancel(JSC::JSValue, CancelPromise&&, ExceptionCode&);
</span><span class="cx"> void cancelNoCheck(JSC::JSValue, CancelPromise&&);
</span><span class="cx">
</span><del>- typedef std::function<void()> ClosedSuccessCallback;
- void closed(ClosedSuccessCallback&&, FailureCallback&&);
</del><ins>+ typedef DOMPromise<std::nullptr_t, JSC::JSValue> ClosedPromise;
+ void closed(ClosedPromise&&);
</ins><span class="cx">
</span><span class="cx"> typedef std::function<void(JSC::JSValue)> ReadSuccessCallback;
</span><span class="cx"> typedef std::function<void()> ReadEndCallback;
</span><span class="lines">@@ -124,10 +124,8 @@
</span><span class="cx"> Vector<std::unique_ptr<ReadableStreamReader>> m_releasedReaders;
</span><span class="cx">
</span><span class="cx"> Optional<CancelPromise> m_cancelPromise;
</span><ins>+ Optional<ClosedPromise> m_closedPromise;
</ins><span class="cx">
</span><del>- ClosedSuccessCallback m_closedSuccessCallback;
- FailureCallback m_closedFailureCallback;
-
</del><span class="cx"> struct ReadCallbacks {
</span><span class="cx"> ReadSuccessCallback successCallback;
</span><span class="cx"> ReadEndCallback endCallback;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamReadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamReader.cpp (186108 => 186109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.cpp 2015-06-30 06:02:24 UTC (rev 186108)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.cpp 2015-06-30 06:47:19 UTC (rev 186109)
</span><span class="lines">@@ -46,13 +46,13 @@
</span><span class="cx"> m_stream.cancelNoCheck(reason, WTF::move(promise));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ReadableStreamReader::closed(ReadableStream::ClosedSuccessCallback&& successCallback, ReadableStream::FailureCallback&& failureCallback)
</del><ins>+void ReadableStreamReader::closed(ReadableStream::ClosedPromise&& promise)
</ins><span class="cx"> {
</span><span class="cx"> if (m_stream.isReadable() && m_stream.reader() != this) {
</span><del>- successCallback();
</del><ins>+ promise.resolve(nullptr);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- m_stream.closed(WTF::move(successCallback), WTF::move(failureCallback));
</del><ins>+ m_stream.closed(WTF::move(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ReadableStreamReader::read(ReadableStream::ReadSuccessCallback&& successCallback, ReadableStream::ReadEndCallback&& endCallback, ReadableStream::FailureCallback&& failureCallback)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamReaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h (186108 => 186109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h 2015-06-30 06:02:24 UTC (rev 186108)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h 2015-06-30 06:47:19 UTC (rev 186109)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> : m_stream(stream) { }
</span><span class="cx">
</span><span class="cx"> void cancel(JSC::JSValue, ReadableStream::CancelPromise&&);
</span><del>- void closed(ReadableStream::ClosedSuccessCallback&&, ReadableStream::FailureCallback&&);
</del><ins>+ void closed(ReadableStream::ClosedPromise&&);
</ins><span class="cx"> void read(ReadableStream::ReadSuccessCallback&&, ReadableStream::ReadEndCallback&&, ReadableStream::FailureCallback&&);
</span><span class="cx"> void releaseLock(ExceptionCode&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSReadableStreamReaderCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp (186108 => 186109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp 2015-06-30 06:02:24 UTC (rev 186108)
+++ trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp 2015-06-30 06:47:19 UTC (rev 186109)
</span><span class="lines">@@ -72,17 +72,8 @@
</span><span class="cx"> return m_closedPromiseDeferred->promise();
</span><span class="cx">
</span><span class="cx"> const_cast<JSReadableStreamReader*>(this)->m_closedPromiseDeferred.set(exec->vm(), JSPromiseDeferred::create(exec, globalObject()));
</span><del>- DeferredWrapper wrapper(exec, globalObject(), m_closedPromiseDeferred.get());
</del><ins>+ impl().closed(DeferredWrapper(exec, globalObject(), m_closedPromiseDeferred.get()));
</ins><span class="cx">
</span><del>- auto successCallback = [wrapper]() mutable {
- wrapper.resolve(jsUndefined());
- };
- auto failureCallback = [wrapper](JSValue value) mutable {
- wrapper.reject(value);
- };
-
- impl().closed(WTF::move(successCallback), WTF::move(failureCallback));
-
</del><span class="cx"> return m_closedPromiseDeferred->promise();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>