- Revision
- 206423
- Author
- [email protected]
- Date
- 2016-09-27 01:47:43 -0700 (Tue, 27 Sep 2016)
Log Message
[Fetch API] Remove ReadableStreamSource firstReadCallback
https://bugs.webkit.org/show_bug.cgi?id=162339
Patch by Youenn Fablet <[email protected]> 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
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (206422 => 206423)
--- 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)
@@ -1,3 +1,35 @@
+2016-09-27 Youenn Fablet <[email protected]>
+
+ [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
+
2016-09-27 Myles C. Maxfield <[email protected]>
REGRESSION(r205883): Letterpressed text is invisible
Modified: trunk/Source/WebCore/Modules/fetch/FetchResponseSource.cpp (206422 => 206423)
--- 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)
@@ -55,17 +55,16 @@
m_response.unsetPendingActivity(&m_response);
}
-void FetchResponseSource::firstReadCallback()
+void FetchResponseSource::doStart()
{
m_response.consumeBodyAsStream();
}
-void FetchResponseSource::doStart()
+void FetchResponseSource::doPull()
{
- // startFinished should not be called as this is a push source, hence overriding default implementation.
+ ASSERT_NOT_REACHED();
}
-
void FetchResponseSource::doCancel()
{
m_isCancelling = true;
Modified: trunk/Source/WebCore/Modules/fetch/FetchResponseSource.h (206422 => 206423)
--- 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)
@@ -52,8 +52,8 @@
bool isReadableStreamLocked() const;
private:
- void firstReadCallback() final;
void doStart() final;
+ void doPull() final;
void doCancel() final;
void setActive() final;
void setInactive() final;
Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (206422 => 206423)
--- 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)
@@ -426,10 +426,6 @@
const stream = reader.@ownerReadableStream;
@assert(!!stream);
- // 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();
-
stream.@disturbed = true;
if (stream.@state === @streamClosed)
return @Promise.@resolve({value: @undefined, done: true});
Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h (206422 => 206423)
--- 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)
@@ -44,11 +44,11 @@
typedef DOMPromise<std::nullptr_t> Promise;
- virtual void firstReadCallback() { }
void start(ReadableStreamDefaultController&&, Promise&&);
+ void pull(Promise&&);
void cancel(JSC::JSValue);
- bool isStarting() const { return !!m_startPromise; }
+ bool isStarting() const { return !!m_promise; }
protected:
ReadableStreamDefaultController& controller() { return m_controller.value(); }
@@ -55,6 +55,7 @@
const ReadableStreamDefaultController& controller() const { return m_controller.value(); }
void startFinished();
+ void pullFinished();
void cancelFinished();
void clean();
@@ -61,17 +62,19 @@
virtual void setActive() = 0;
virtual void setInactive() = 0;
- virtual void doStart() { startFinished(); }
- virtual void doCancel() { }
+ virtual void doStart() = 0;
+ virtual void doPull() = 0;
+ virtual void doCancel() = 0;
private:
- Optional<Promise> m_startPromise;
+ Optional<Promise> m_promise;
Optional<ReadableStreamDefaultController> m_controller;
};
inline void ReadableStreamSource::start(ReadableStreamDefaultController&& controller, Promise&& promise)
{
- m_startPromise = WTFMove(promise);
+ ASSERT(!m_promise);
+ m_promise = WTFMove(promise);
m_controller = WTFMove(controller);
setActive();
@@ -78,13 +81,31 @@
doStart();
}
+inline void ReadableStreamSource::pull(Promise&& promise)
+{
+ ASSERT(!m_promise);
+ ASSERT(m_controller);
+
+ m_promise = WTFMove(promise);
+
+ setActive();
+ doPull();
+}
+
inline void ReadableStreamSource::startFinished()
{
- ASSERT(m_startPromise);
- std::exchange(m_startPromise, Nullopt).value().resolve(nullptr);
+ ASSERT(m_promise);
+ std::exchange(m_promise, Nullopt).value().resolve(nullptr);
setInactive();
}
+inline void ReadableStreamSource::pullFinished()
+{
+ ASSERT(m_promise);
+ std::exchange(m_promise, Nullopt).value().resolve(nullptr);
+ setInactive();
+}
+
inline void ReadableStreamSource::cancel(JSC::JSValue)
{
clean();
@@ -93,8 +114,8 @@
inline void ReadableStreamSource::clean()
{
- if (m_startPromise) {
- m_startPromise = Nullopt;
+ if (m_promise) {
+ m_promise = Nullopt;
setInactive();
}
}
Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamSource.idl (206422 => 206423)
--- 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)
@@ -31,12 +31,10 @@
Conditional=READABLE_STREAM_API,
SkipVTableValidation
] interface ReadableStreamSource {
- // Methods to support push sources. To support all sources, pull method might need to be added, and cancel may return a promise.
[Custom] Promise start(ReadableStreamDefaultController controller);
+ [Custom] Promise pull(ReadableStreamDefaultController controller);
void cancel(any reason);
- [PrivateIdentifier] void firstReadCallback();
-
// Place holder to keep the controller linked to the source.
[CachedAttribute, CustomGetter] readonly attribute any controller;
};
Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamSourceCustom.cpp (206422 => 206423)
--- 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)
@@ -35,22 +35,42 @@
namespace WebCore {
+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));
+}
+
JSValue JSReadableStreamSource::start(ExecState& state)
{
- JSReadableStreamDefaultController* controller = jsDynamicCast<JSReadableStreamDefaultController*>(state.argument(0));
+ ASSERT(state.argumentCount());
+ JSReadableStreamDefaultController* controller = jsDynamicCast<JSReadableStreamDefaultController*>(state.uncheckedArgument(0));
ASSERT(controller);
- JSReadableStreamSource* jsSource = const_cast<JSReadableStreamSource*>(this);
- m_controller.set(state.vm(), jsSource, state.argument(0));
+ m_controller.set(state.vm(), this, controller);
- 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();
+ return callPromiseFunction<startReadableStream, PromiseExecutionScope::WindowOrWorker>(state);
}
+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);
+}
+
JSValue JSReadableStreamSource::controller(ExecState&) const
{
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h (206422 => 206423)
--- 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)
@@ -47,7 +47,6 @@
macro(fetchRequest) \
macro(fillFromJS) \
macro(finishConsumingStream) \
- macro(firstReadCallback) \
macro(getUserMedia) \
macro(getRemoteStreams) \
macro(getSenders) \
