<!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>[206423] 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/206423">206423</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-27 01:47:43 -0700 (Tue, 27 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Fetch API] Remove ReadableStreamSource firstReadCallback
https://bugs.webkit.org/show_bug.cgi?id=162339
Patch by Youenn Fablet <youenn@apple.com> on 2016-09-27
Reviewed by Sam Weinig.
No observable change of behavior.
Removing ReadableStreamSource firstReadCallback.
This makes the enqueuing of data to happen when the stream is created.
In the future, we may want to implement doPull() to enqueue data when stream actually needs it.
* Modules/fetch/FetchResponseSource.cpp:
(WebCore::FetchResponseSource::doPull): Introduced as we introduce pull() in ReadableStreamSource.
* Modules/fetch/FetchResponseSource.h:
* Modules/streams/ReadableStreamInternals.js:
(readFromReadableStreamDefaultReader): Removing firstReadCallback use.
* Modules/streams/ReadableStreamSource.h: Renaming m_startPromise in m_promise since m_promise may store start and pull promises.
(WebCore::ReadableStreamSource::isStarting):
(WebCore::ReadableStreamSource::start):
(WebCore::ReadableStreamSource::pull): Introduced to support ReadableStreamSource pulling.
(WebCore::ReadableStreamSource::startFinished):
(WebCore::ReadableStreamSource::pullFinished): Ditto.
(WebCore::ReadableStreamSource::clean):
* Modules/streams/ReadableStreamSource.idl: Ditto.
* bindings/js/JSReadableStreamSourceCustom.cpp: Refactoring to use callPromiseFunction
(WebCore::startReadableStream):
(WebCore::JSReadableStreamSource::start):
(WebCore::pullReadableStream): Introduced to support ReadableStreamSource pulling.
(WebCore::JSReadableStreamSource::pull): Ditto.
* bindings/js/WebCoreBuiltinNames.h: Removing firstReadCallback</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponseSourcecpp">trunk/Source/WebCore/Modules/fetch/FetchResponseSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponseSourceh">trunk/Source/WebCore/Modules/fetch/FetchResponseSource.h</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs">trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamSourceh">trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamSourceidl">trunk/Source/WebCore/Modules/streams/ReadableStreamSource.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSReadableStreamSourceCustomcpp">trunk/Source/WebCore/bindings/js/JSReadableStreamSourceCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreBuiltinNamesh">trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206422 => 206423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-27 08:10:34 UTC (rev 206422)
+++ trunk/Source/WebCore/ChangeLog 2016-09-27 08:47:43 UTC (rev 206423)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-09-27 Youenn Fablet <youenn@apple.com>
+
+ [Fetch API] Remove ReadableStreamSource firstReadCallback
+ https://bugs.webkit.org/show_bug.cgi?id=162339
+
+ Reviewed by Sam Weinig.
+
+ No observable change of behavior.
+ Removing ReadableStreamSource firstReadCallback.
+ This makes the enqueuing of data to happen when the stream is created.
+ In the future, we may want to implement doPull() to enqueue data when stream actually needs it.
+
+ * Modules/fetch/FetchResponseSource.cpp:
+ (WebCore::FetchResponseSource::doPull): Introduced as we introduce pull() in ReadableStreamSource.
+ * Modules/fetch/FetchResponseSource.h:
+ * Modules/streams/ReadableStreamInternals.js:
+ (readFromReadableStreamDefaultReader): Removing firstReadCallback use.
+ * Modules/streams/ReadableStreamSource.h: Renaming m_startPromise in m_promise since m_promise may store start and pull promises.
+ (WebCore::ReadableStreamSource::isStarting):
+ (WebCore::ReadableStreamSource::start):
+ (WebCore::ReadableStreamSource::pull): Introduced to support ReadableStreamSource pulling.
+ (WebCore::ReadableStreamSource::startFinished):
+ (WebCore::ReadableStreamSource::pullFinished): Ditto.
+ (WebCore::ReadableStreamSource::clean):
+ * Modules/streams/ReadableStreamSource.idl: Ditto.
+ * bindings/js/JSReadableStreamSourceCustom.cpp: Refactoring to use callPromiseFunction
+ (WebCore::startReadableStream):
+ (WebCore::JSReadableStreamSource::start):
+ (WebCore::pullReadableStream): Introduced to support ReadableStreamSource pulling.
+ (WebCore::JSReadableStreamSource::pull): Ditto.
+ * bindings/js/WebCoreBuiltinNames.h: Removing firstReadCallback
+
</ins><span class="cx"> 2016-09-27 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r205883): Letterpressed text is invisible
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponseSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponseSource.cpp (206422 => 206423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponseSource.cpp 2016-09-27 08:10:34 UTC (rev 206422)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponseSource.cpp 2016-09-27 08:47:43 UTC (rev 206423)
</span><span class="lines">@@ -55,17 +55,16 @@
</span><span class="cx"> m_response.unsetPendingActivity(&m_response);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchResponseSource::firstReadCallback()
</del><ins>+void FetchResponseSource::doStart()
</ins><span class="cx"> {
</span><span class="cx"> m_response.consumeBodyAsStream();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchResponseSource::doStart()
</del><ins>+void FetchResponseSource::doPull()
</ins><span class="cx"> {
</span><del>- // startFinished should not be called as this is a push source, hence overriding default implementation.
</del><ins>+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> void FetchResponseSource::doCancel()
</span><span class="cx"> {
</span><span class="cx"> m_isCancelling = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponseSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponseSource.h (206422 => 206423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponseSource.h 2016-09-27 08:10:34 UTC (rev 206422)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponseSource.h 2016-09-27 08:47:43 UTC (rev 206423)
</span><span class="lines">@@ -52,8 +52,8 @@
</span><span class="cx"> bool isReadableStreamLocked() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void firstReadCallback() final;
</del><span class="cx"> void doStart() final;
</span><ins>+ void doPull() final;
</ins><span class="cx"> void doCancel() final;
</span><span class="cx"> void setActive() final;
</span><span class="cx"> void setInactive() final;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (206422 => 206423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2016-09-27 08:10:34 UTC (rev 206422)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2016-09-27 08:47:43 UTC (rev 206423)
</span><span class="lines">@@ -426,10 +426,6 @@
</span><span class="cx"> const stream = reader.@ownerReadableStream;
</span><span class="cx"> @assert(!!stream);
</span><span class="cx">
</span><del>- // Native sources may want to start enqueueing at the time of the first read request.
- if (!stream.@disturbed && stream.@state === @streamReadable && stream.@readableStreamController.@underlyingSource.@firstReadCallback)
- stream.@readableStreamController.@underlyingSource.@firstReadCallback();
-
</del><span class="cx"> stream.@disturbed = true;
</span><span class="cx"> if (stream.@state === @streamClosed)
</span><span class="cx"> return @Promise.@resolve({value: @undefined, done: true});
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h (206422 => 206423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h 2016-09-27 08:10:34 UTC (rev 206422)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h 2016-09-27 08:47:43 UTC (rev 206423)
</span><span class="lines">@@ -44,11 +44,11 @@
</span><span class="cx">
</span><span class="cx"> typedef DOMPromise<std::nullptr_t> Promise;
</span><span class="cx">
</span><del>- virtual void firstReadCallback() { }
</del><span class="cx"> void start(ReadableStreamDefaultController&&, Promise&&);
</span><ins>+ void pull(Promise&&);
</ins><span class="cx"> void cancel(JSC::JSValue);
</span><span class="cx">
</span><del>- bool isStarting() const { return !!m_startPromise; }
</del><ins>+ bool isStarting() const { return !!m_promise; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> ReadableStreamDefaultController& controller() { return m_controller.value(); }
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> const ReadableStreamDefaultController& controller() const { return m_controller.value(); }
</span><span class="cx">
</span><span class="cx"> void startFinished();
</span><ins>+ void pullFinished();
</ins><span class="cx"> void cancelFinished();
</span><span class="cx"> void clean();
</span><span class="cx">
</span><span class="lines">@@ -61,17 +62,19 @@
</span><span class="cx"> virtual void setActive() = 0;
</span><span class="cx"> virtual void setInactive() = 0;
</span><span class="cx">
</span><del>- virtual void doStart() { startFinished(); }
- virtual void doCancel() { }
</del><ins>+ virtual void doStart() = 0;
+ virtual void doPull() = 0;
+ virtual void doCancel() = 0;
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- Optional<Promise> m_startPromise;
</del><ins>+ Optional<Promise> m_promise;
</ins><span class="cx"> Optional<ReadableStreamDefaultController> m_controller;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline void ReadableStreamSource::start(ReadableStreamDefaultController&& controller, Promise&& promise)
</span><span class="cx"> {
</span><del>- m_startPromise = WTFMove(promise);
</del><ins>+ ASSERT(!m_promise);
+ m_promise = WTFMove(promise);
</ins><span class="cx"> m_controller = WTFMove(controller);
</span><span class="cx">
</span><span class="cx"> setActive();
</span><span class="lines">@@ -78,13 +81,31 @@
</span><span class="cx"> doStart();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void ReadableStreamSource::pull(Promise&& promise)
+{
+ ASSERT(!m_promise);
+ ASSERT(m_controller);
+
+ m_promise = WTFMove(promise);
+
+ setActive();
+ doPull();
+}
+
</ins><span class="cx"> inline void ReadableStreamSource::startFinished()
</span><span class="cx"> {
</span><del>- ASSERT(m_startPromise);
- std::exchange(m_startPromise, Nullopt).value().resolve(nullptr);
</del><ins>+ ASSERT(m_promise);
+ std::exchange(m_promise, Nullopt).value().resolve(nullptr);
</ins><span class="cx"> setInactive();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void ReadableStreamSource::pullFinished()
+{
+ ASSERT(m_promise);
+ std::exchange(m_promise, Nullopt).value().resolve(nullptr);
+ setInactive();
+}
+
</ins><span class="cx"> inline void ReadableStreamSource::cancel(JSC::JSValue)
</span><span class="cx"> {
</span><span class="cx"> clean();
</span><span class="lines">@@ -93,8 +114,8 @@
</span><span class="cx">
</span><span class="cx"> inline void ReadableStreamSource::clean()
</span><span class="cx"> {
</span><del>- if (m_startPromise) {
- m_startPromise = Nullopt;
</del><ins>+ if (m_promise) {
+ m_promise = Nullopt;
</ins><span class="cx"> setInactive();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamSourceidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamSource.idl (206422 => 206423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamSource.idl 2016-09-27 08:10:34 UTC (rev 206422)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamSource.idl 2016-09-27 08:47:43 UTC (rev 206423)
</span><span class="lines">@@ -31,12 +31,10 @@
</span><span class="cx"> Conditional=READABLE_STREAM_API,
</span><span class="cx"> SkipVTableValidation
</span><span class="cx"> ] interface ReadableStreamSource {
</span><del>- // Methods to support push sources. To support all sources, pull method might need to be added, and cancel may return a promise.
</del><span class="cx"> [Custom] Promise start(ReadableStreamDefaultController controller);
</span><ins>+ [Custom] Promise pull(ReadableStreamDefaultController controller);
</ins><span class="cx"> void cancel(any reason);
</span><span class="cx">
</span><del>- [PrivateIdentifier] void firstReadCallback();
-
</del><span class="cx"> // Place holder to keep the controller linked to the source.
</span><span class="cx"> [CachedAttribute, CustomGetter] readonly attribute any controller;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSReadableStreamSourceCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamSourceCustom.cpp (206422 => 206423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSReadableStreamSourceCustom.cpp 2016-09-27 08:10:34 UTC (rev 206422)
+++ trunk/Source/WebCore/bindings/js/JSReadableStreamSourceCustom.cpp 2016-09-27 08:47:43 UTC (rev 206423)
</span><span class="lines">@@ -35,22 +35,42 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static void startReadableStream(JSC::ExecState& state, Ref<DeferredPromise>&& promise)
+{
+ JSReadableStreamSource* source = jsDynamicCast<JSReadableStreamSource*>(state.thisValue());
+ ASSERT(source);
+
+ ASSERT(state.argumentCount());
+ JSReadableStreamDefaultController* controller = jsDynamicCast<JSReadableStreamDefaultController*>(state.uncheckedArgument(0));
+ ASSERT(controller);
+
+ source->wrapped().start(ReadableStreamDefaultController(controller), WTFMove(promise));
+}
+
</ins><span class="cx"> JSValue JSReadableStreamSource::start(ExecState& state)
</span><span class="cx"> {
</span><del>- JSReadableStreamDefaultController* controller = jsDynamicCast<JSReadableStreamDefaultController*>(state.argument(0));
</del><ins>+ ASSERT(state.argumentCount());
+ JSReadableStreamDefaultController* controller = jsDynamicCast<JSReadableStreamDefaultController*>(state.uncheckedArgument(0));
</ins><span class="cx"> ASSERT(controller);
</span><span class="cx">
</span><del>- JSReadableStreamSource* jsSource = const_cast<JSReadableStreamSource*>(this);
- m_controller.set(state.vm(), jsSource, state.argument(0));
</del><ins>+ m_controller.set(state.vm(), this, controller);
</ins><span class="cx">
</span><del>- ASSERT(globalObject());
- JSC::JSPromiseDeferred* promiseDeferred = JSC::JSPromiseDeferred::create(&state, globalObject());
- if (!promiseDeferred)
- return jsUndefined();
- wrapped().start(ReadableStreamDefaultController(controller), DeferredPromise::create(*globalObject(), *promiseDeferred));
- return promiseDeferred->promise();
</del><ins>+ return callPromiseFunction<startReadableStream, PromiseExecutionScope::WindowOrWorker>(state);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static void pullReadableStream(JSC::ExecState& state, Ref<DeferredPromise>&& promise)
+{
+ JSReadableStreamSource* source = jsDynamicCast<JSReadableStreamSource*>(state.thisValue());
+ ASSERT(source);
+
+ source->wrapped().pull(WTFMove(promise));
+}
+
+JSValue JSReadableStreamSource::pull(ExecState& state)
+{
+ return callPromiseFunction<pullReadableStream, PromiseExecutionScope::WindowOrWorker>(state);
+}
+
</ins><span class="cx"> JSValue JSReadableStreamSource::controller(ExecState&) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreBuiltinNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h (206422 => 206423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2016-09-27 08:10:34 UTC (rev 206422)
+++ trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2016-09-27 08:47:43 UTC (rev 206423)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> macro(fetchRequest) \
</span><span class="cx"> macro(fillFromJS) \
</span><span class="cx"> macro(finishConsumingStream) \
</span><del>- macro(firstReadCallback) \
</del><span class="cx"> macro(getUserMedia) \
</span><span class="cx"> macro(getRemoteStreams) \
</span><span class="cx"> macro(getSenders) \
</span></span></pre>
</div>
</div>
</body>
</html>