<!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>[182797] 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/182797">182797</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-14 09:13:32 -0700 (Tue, 14 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/182794">r182794</a>.
https://bugs.webkit.org/show_bug.cgi?id=143714
readable-stream-templated.html fails on Debug bots (Requested
by youenn on #webkit).
Reverted changeset:
"[Streams API] ReadableStream constructor start function
should be able to close the stream"
https://bugs.webkit.org/show_bug.cgi?id=143363
http://trac.webkit.org/changeset/182794</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationreadablestreamreaderexpectedtxt">trunk/LayoutTests/streams/reference-implementation/readable-stream-reader-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationreadablestreamtemplatedexpectedtxt">trunk/LayoutTests/streams/reference-implementation/readable-stream-templated-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="#trunkSourceWebCorebindingsjsJSDOMPromiseh">trunk/Source/WebCore/bindings/js/JSDOMPromise.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSReadableStreamReaderCustomcpp">trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableStreamJSSourcecpp">trunk/Source/WebCore/bindings/js/ReadableStreamJSSource.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182796 => 182797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-14 15:15:35 UTC (rev 182796)
+++ trunk/LayoutTests/ChangeLog 2015-04-14 16:13:32 UTC (rev 182797)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-14 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r182794.
+ https://bugs.webkit.org/show_bug.cgi?id=143714
+
+ readable-stream-templated.html fails on Debug bots (Requested
+ by youenn on #webkit).
+
+ Reverted changeset:
+
+ "[Streams API] ReadableStream constructor start function
+ should be able to close the stream"
+ https://bugs.webkit.org/show_bug.cgi?id=143363
+ http://trac.webkit.org/changeset/182794
+
</ins><span class="cx"> 2015-04-14 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] ReadableStream constructor start function should be able to close the stream
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationreadablestreamreaderexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/readable-stream-reader-expected.txt (182796 => 182797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/readable-stream-reader-expected.txt 2015-04-14 15:15:35 UTC (rev 182796)
+++ trunk/LayoutTests/streams/reference-implementation/readable-stream-reader-expected.txt 2015-04-14 16:13:32 UTC (rev 182797)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> PASS Constructing a ReadableStreamReader directly should be OK if the stream is errored
</span><span class="cx"> FAIL Reading from a reader for an empty stream will wait until a chunk is available read is not implemented
</span><span class="cx"> FAIL cancel() on a reader releases the reader before calling through cancel is not implemented
</span><del>-PASS closed should be fulfilled after stream is closed (.closed access before acquiring)
</del><ins>+TIMEOUT closed should be fulfilled after stream is closed (.closed access before acquiring) Test timed out
</ins><span class="cx"> FAIL closed should be fulfilled after reader releases its lock (multiple stream locks) releaseLock is not implemented
</span><span class="cx"> FAIL Multiple readers can access the stream in sequence read is not implemented
</span><span class="cx"> FAIL Cannot use an already-released reader to unlock a stream again releaseLock is not implemented
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationreadablestreamtemplatedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/readable-stream-templated-expected.txt (182796 => 182797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/readable-stream-templated-expected.txt 2015-04-14 15:15:35 UTC (rev 182796)
+++ trunk/LayoutTests/streams/reference-implementation/readable-stream-templated-expected.txt 2015-04-14 16:13:32 UTC (rev 182797)
</span><span class="lines">@@ -15,10 +15,10 @@
</span><span class="cx"> PASS Running templatedRSClosed with ReadableStream (closed via call in start)
</span><span class="cx"> FAIL cancel() should return a distinct fulfilled promise each time cancel is not implemented
</span><span class="cx"> PASS getReader() should be OK
</span><del>-PASS should be able to acquire multiple readers, since they are all auto-released
</del><ins>+FAIL should be able to acquire multiple readers, since they are all auto-released ReadableStream is locked
</ins><span class="cx"> PASS Running templatedRSClosedReader with ReadableStream (closed via call in start) reader
</span><span class="cx"> FAIL read() should fulfill with { value: undefined, done: true } read is not implemented
</span><del>-PASS closed should fulfill with undefined
</del><ins>+TIMEOUT closed should fulfill with undefined Test timed out
</ins><span class="cx"> FAIL cancel() should return a distinct fulfilled promise each time cancel is not implemented
</span><span class="cx"> PASS Running templatedRSClosed with ReadableStream (closed via cancel)
</span><span class="cx"> FAIL cancel() should return a distinct fulfilled promise each time cancel is not implemented
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182796 => 182797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-14 15:15:35 UTC (rev 182796)
+++ trunk/Source/WebCore/ChangeLog 2015-04-14 16:13:32 UTC (rev 182797)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-14 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r182794.
+ https://bugs.webkit.org/show_bug.cgi?id=143714
+
+ readable-stream-templated.html fails on Debug bots (Requested
+ by youenn on #webkit).
+
+ Reverted changeset:
+
+ "[Streams API] ReadableStream constructor start function
+ should be able to close the stream"
+ https://bugs.webkit.org/show_bug.cgi?id=143363
+ http://trac.webkit.org/changeset/182794
+
</ins><span class="cx"> 2015-04-14 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Unreviewed build fix after r182707.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.cpp (182796 => 182797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.cpp 2015-04-14 15:15:35 UTC (rev 182796)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.cpp 2015-04-14 16:13:32 UTC (rev 182797)
</span><span class="lines">@@ -58,16 +58,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ReadableStream::changeStateToClosed()
-{
- if (m_state != State::Readable)
- return;
- m_state = State::Closed;
- if (m_reader)
- m_reader->changeStateToClosed();
- ASSERT(!m_reader);
-}
-
</del><span class="cx"> void ReadableStream::start()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.h (182796 => 182797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.h 2015-04-14 15:15:35 UTC (rev 182796)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.h 2015-04-14 16:13:32 UTC (rev 182797)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx"> State internalState() { return m_state; }
</span><span class="cx">
</span><span class="cx"> void start();
</span><del>- void changeStateToClosed();
</del><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> ReadableStream(ScriptExecutionContext&, Ref<ReadableStreamSource>&&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamReadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamReader.cpp (182796 => 182797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.cpp 2015-04-14 15:15:35 UTC (rev 182796)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.cpp 2015-04-14 16:13:32 UTC (rev 182797)
</span><span class="lines">@@ -41,13 +41,14 @@
</span><span class="cx">
</span><span class="cx"> ReadableStreamReader::ReadableStreamReader(ReadableStream& stream)
</span><span class="cx"> : ActiveDOMObject(stream.scriptExecutionContext())
</span><del>- , m_stream(&stream)
</del><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> readableStreamReaderCounter.increment();
</span><span class="cx"> #endif
</span><span class="cx"> suspendIfNeeded();
</span><del>- initialize();
</del><ins>+ ASSERT_WITH_MESSAGE(!stream.reader(), "A ReadableStream cannot be locked by two readers at the same time.");
+ m_stream = &stream;
+ stream.lock(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ReadableStreamReader::~ReadableStreamReader()
</span><span class="lines">@@ -61,46 +62,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ReadableStreamReader::initialize()
</del><ins>+void ReadableStreamReader::closed(ClosedSuccessCallback, ClosedErrorCallback)
</ins><span class="cx"> {
</span><del>- ASSERT_WITH_MESSAGE(!m_stream->isLocked(), "A ReadableStream cannot be locked by two readers at the same time.");
- m_stream->lock(*this);
- if (m_stream->internalState() == ReadableStream::State::Closed) {
- changeStateToClosed();
- return;
- }
</del><ins>+ notImplemented();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ReadableStreamReader::releaseStream()
-{
- ASSERT(m_stream);
- m_stream->release();
- m_stream = nullptr;
-}
-
-void ReadableStreamReader::closed(ClosedSuccessCallback successCallback, ClosedErrorCallback)
-{
- if (m_state == State::Closed) {
- successCallback();
- return;
- }
- m_closedSuccessCallback = WTF::move(successCallback);
-}
-
-void ReadableStreamReader::changeStateToClosed()
-{
- ASSERT(m_state == State::Readable);
- m_state = State::Closed;
-
- if (m_closedSuccessCallback) {
- ClosedSuccessCallback closedSuccessCallback = WTF::move(m_closedSuccessCallback);
- closedSuccessCallback();
- }
- ASSERT(!m_closedSuccessCallback);
- releaseStream();
- // FIXME: Implement read promise fulfilling.
-}
-
</del><span class="cx"> const char* ReadableStreamReader::activeDOMObjectName() const
</span><span class="cx"> {
</span><span class="cx"> return "ReadableStreamReader";
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamReaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h (182796 => 182797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h 2015-04-14 15:15:35 UTC (rev 182796)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h 2015-04-14 16:13:32 UTC (rev 182797)
</span><span class="lines">@@ -46,12 +46,6 @@
</span><span class="cx"> // See https://streams.spec.whatwg.org/#reader-class for more information.
</span><span class="cx"> class ReadableStreamReader : public ActiveDOMObject, public ScriptWrappable, public RefCounted<ReadableStreamReader> {
</span><span class="cx"> public:
</span><del>- enum class State {
- Readable,
- Closed,
- Errored
- };
-
</del><span class="cx"> virtual ~ReadableStreamReader();
</span><span class="cx">
</span><span class="cx"> ReadableStream* stream() { return m_stream.get(); }
</span><span class="lines">@@ -60,23 +54,15 @@
</span><span class="cx"> typedef std::function<void()> ClosedErrorCallback;
</span><span class="cx"> void closed(ClosedSuccessCallback, ClosedErrorCallback);
</span><span class="cx">
</span><del>- void changeStateToClosed();
-
</del><span class="cx"> protected:
</span><span class="cx"> ReadableStreamReader(ReadableStream&);
</span><span class="cx">
</span><del>- void releaseStream();
-
</del><span class="cx"> private:
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><span class="cx"> bool canSuspendForPageCache() const override;
</span><del>- void initialize();
</del><span class="cx">
</span><span class="cx"> RefPtr<ReadableStream> m_stream;
</span><del>- State m_state { State::Readable };
-
- ClosedSuccessCallback m_closedSuccessCallback;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromiseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.h (182796 => 182797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2015-04-14 15:15:35 UTC (rev 182796)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2015-04-14 16:13:32 UTC (rev 182797)
</span><span class="lines">@@ -98,13 +98,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<>
</span><del>-inline void DeferredWrapper::resolve<JSC::JSValue>(const JSC::JSValue& value)
-{
- JSC::ExecState* exec = m_globalObject->globalExec();
- JSC::JSLockHolder locker(exec);
- resolve(exec, value);
-}
-template<>
</del><span class="cx"> inline void DeferredWrapper::resolve<Vector<unsigned char>>(const Vector<unsigned char>& result)
</span><span class="cx"> {
</span><span class="cx"> JSC::ExecState* exec = m_globalObject->globalExec();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSReadableStreamReaderCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp (182796 => 182797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp 2015-04-14 15:15:35 UTC (rev 182796)
+++ trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp 2015-04-14 16:13:32 UTC (rev 182797)
</span><span class="lines">@@ -71,8 +71,9 @@
</span><span class="cx"> {
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = getOrCreatePromiseDeferredFromObject(exec, this, globalObject(), closedPromiseSlotName());
</span><span class="cx"> DeferredWrapper wrapper(exec, globalObject(), promiseDeferred);
</span><del>- auto successCallback = [wrapper]() mutable {
- wrapper.resolve(jsUndefined());
</del><ins>+ auto successCallback = [this, wrapper]() mutable {
+ // FIXME: return jsUndefined().
+ wrapper.resolve(&impl());
</ins><span class="cx"> };
</span><span class="cx"> auto failureCallback = [this, wrapper]() mutable {
</span><span class="cx"> // FIXME: return stored error.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableStreamJSSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableStreamJSSource.cpp (182796 => 182797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableStreamJSSource.cpp 2015-04-14 15:15:35 UTC (rev 182796)
+++ trunk/Source/WebCore/bindings/js/ReadableStreamJSSource.cpp 2015-04-14 16:13:32 UTC (rev 182797)
</span><span class="lines">@@ -64,21 +64,6 @@
</span><span class="cx"> return propertySlot.getValue(exec, propertyName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// This slot name is used to store the JSReadableStream in created JS functions (enqueue, close...).
-// This allows retrieving the corresponding JSReadableStream when executing the JS function.
-static JSC::PrivateName& readableStreamSlotName()
-{
- static NeverDestroyed<JSC::PrivateName> readableStreamSlotName("readableStream");
- return readableStreamSlotName;
-}
-
-static ReadableJSStream& getReadableJSStream(ExecState* exec)
-{
- JSReadableStream* jsReadableStream = jsDynamicCast<JSReadableStream*>(getInternalSlotFromObject(exec, exec->callee(), readableStreamSlotName()));
- ASSERT(jsReadableStream);
- return static_cast<ReadableJSStream&>(jsReadableStream->impl());
-}
-
</del><span class="cx"> static inline JSValue getPropertyFromObject(ExecState* exec, JSObject* object, const char* identifier)
</span><span class="cx"> {
</span><span class="cx"> return object->get(exec, Identifier::fromString(exec, identifier));
</span><span class="lines">@@ -121,19 +106,11 @@
</span><span class="cx"> return JSFunction::create(exec->vm(), exec->callee()->globalObject(), 1, String(), notImplementedFunction);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue JSC_HOST_CALL closeReadableStreamFunction(ExecState* exec)
</del><ins>+static inline JSFunction* createReadableStreamCloseFunction(ExecState* exec)
</ins><span class="cx"> {
</span><del>- getReadableJSStream(exec).changeStateToClosed();
- return JSValue::encode(jsUndefined());
</del><ins>+ return JSFunction::create(exec->vm(), exec->callee()->globalObject(), 0, String(), notImplementedFunction);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static inline JSFunction* createReadableStreamCloseFunction(ExecState* exec, JSReadableStream* readableStream)
-{
- JSFunction* closeFunction = JSFunction::create(exec->vm(), exec->callee()->globalObject(), 0, String(), closeReadableStreamFunction);
- setInternalSlotToObject(exec, closeFunction, readableStreamSlotName(), readableStream);
- return closeFunction;
-}
-
</del><span class="cx"> static inline JSFunction* createReadableStreamErrorFunction(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> return JSFunction::create(exec->vm(), exec->callee()->globalObject(), 1, String(), notImplementedFunction);
</span><span class="lines">@@ -147,10 +124,10 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline JSObject* createReadableStreamController(JSC::ExecState* exec, JSReadableStream* readableStream)
</del><ins>+static inline JSObject* createReadableStreamController(JSC::ExecState* exec)
</ins><span class="cx"> {
</span><span class="cx"> JSFunction* enqueueFunction = createReadableStreamEnqueueFunction(exec);
</span><del>- JSFunction* closeFunction = createReadableStreamCloseFunction(exec, readableStream);
</del><ins>+ JSFunction* closeFunction = createReadableStreamCloseFunction(exec);
</ins><span class="cx"> JSFunction* errorFunction = createReadableStreamErrorFunction(exec);
</span><span class="cx">
</span><span class="cx"> JSObject* controller = JSFinalObject::create(exec->vm(), JSFinalObject::createStructure(exec->vm(), exec->callee()->globalObject(), jsNull(), 3));
</span><span class="lines">@@ -164,7 +141,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(exec);
</span><span class="cx">
</span><del>- m_controller.set(exec->vm(), createReadableStreamController(exec, readableStream));
</del><ins>+ m_controller.set(exec->vm(), createReadableStreamController(exec));
</ins><span class="cx">
</span><span class="cx"> JSValue startFunction = getPropertyFromObject(exec, m_source.get(), "start");
</span><span class="cx"> if (!startFunction.isFunction()) {
</span></span></pre>
</div>
</div>
</body>
</html>