Changeset 190608 in webkit

Timestamp:

Oct 5, 2015 11:20:58 PM (9 years ago)

Author:

youenn.fablet@crf.canon.fr

Message:

Migrate streams API to JS Builtins
​https://bugs.webkit.org/show_bug.cgi?id=147092

Reviewed by Darin Adler.

Source/WebCore:

Moved ReadableStream implementation from C++ to JS Builtins.
Created specific private constructors for ReadableStreamReader and ReadableStreamController.
Added these constructors to JSDOMWindowBase.
Constructors are based on a template found in JSDOMConstructor which might serve to webidl-generated classes as well.

Covered by existing tests.

• CMakeLists.txt:
• DerivedSources.make:
• Modules/streams/ReadableStream.cpp: Removed.
• Modules/streams/ReadableStream.h: Removed.
• Modules/streams/ReadableStream.idl:
• Modules/streams/ReadableStream.js:

(strategy.size):
(initializeReadableStream):
(cancel):
(getReader):
(pipeTo):
(tee):
(locked):

• Modules/streams/ReadableStreamController.h:
• Modules/streams/ReadableStreamController.idl:
• Modules/streams/ReadableStreamController.js: Added.

(enqueue):
(error):
(close):
(desiredSize):

• Modules/streams/ReadableStreamInternals.js:

(privateInitializeReadableStreamReader):
(privateInitializeReadableStreamController):
(isReadableStream):
(isReadableStreamReader):
(isReadableStreamController):
(errorReadableStream):
(requestReadableStreamPull):
(getReadableStreamDesiredSize):
(releaseReadableStreamReader):
(cancelReadableStream):
(finishClosingReadableStream):
(closeReadableStream):
(closeReadableStreamReader):
(enqueueInReadableStream):
(readFromReadableStreamReader):
(invokeOrNoop):
(promiseInvokeOrNoop):

• Modules/streams/ReadableStreamReader.cpp: Removed.
• Modules/streams/ReadableStreamReader.h:
• Modules/streams/ReadableStreamReader.idl:
• Modules/streams/ReadableStreamReader.js: Copied from Source/WebCore/Modules/streams/ReadableStream.js.

(cancel):
(read):
(releaseLock):
(closed):

• WebCore.vcxproj/WebCore.vcxproj:
• WebCore.vcxproj/WebCore.vcxproj.filters:
• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSBindingsAllInOne.cpp:
• bindings/js/JSDOMConstructor.h: Added.

(WebCore::JSBuiltinConstructor::create):
(WebCore::JSBuiltinConstructor::createStructure):
(WebCore::JSBuiltinConstructor::JSBuiltinConstructor):
(WebCore::JSBuiltinConstructor::initializeProperties):
(WebCore::JSBuiltinConstructor<JSClass>::finishCreation):
(WebCore::JSBuiltinConstructor<JSClass>::construct):
(WebCore::JSBuiltinConstructor<JSClass>::getConstructData):

• bindings/js/JSDOMWindowBase.cpp:

(WebCore::JSDOMWindowBase::finishCreation):

• bindings/js/JSReadableStreamControllerCustom.cpp: Removed.
• bindings/js/JSReadableStreamCustom.cpp: Removed.
• bindings/js/JSReadableStreamPrivateConstructors.cpp: Added.

(WebCore::constructJSReadableStreamController):
(WebCore::constructJSReadableStreamReader):
(WebCore::JSBuiltinConstructor<JSReadableStreamReader>::createJSObject):
(WebCore::JSBuiltinConstructor<JSReadableStreamController>::createJSObject):
(WebCore::JSBuiltinReadableStreamReaderPrivateConstructor::createInitializeFunction):
(WebCore::JSBuiltinReadableStreamControllerPrivateConstructor::createInitializeFunction):
(WebCore::createReadableStreamReaderPrivateConstructor):
(WebCore::createReadableStreamControllerPrivateConstructor):

• bindings/js/JSReadableStreamPrivateConstructors.h: Added.
• bindings/js/JSReadableStreamReaderCustom.cpp: Removed.
• bindings/js/ReadableJSStream.cpp: Removed.
• bindings/js/ReadableJSStream.h: Removed.
• bindings/js/WebCoreBuiltinNames.h: Added.

(WebCore::WebCoreBuiltinNames::WebCoreBuiltinNames):

• bindings/js/WebCoreJSBuiltins.cpp:
• bindings/js/WebCoreJSClientData.h:

(WebCore::WebCoreJSClientData::WebCoreJSClientData):
(WebCore::WebCoreJSClientData::builtinNames):
(WebCore::WebCoreJSClientData::readableStreamControllerBuiltins):
(WebCore::WebCoreJSClientData::readableStreamReaderBuiltins):

LayoutTests:

Rebasing some tests, one subtest passing, two others still failing but with different reasons.

• streams/reference-implementation/brand-checks-expected.txt:
• streams/reference-implementation/readable-stream-reader-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/streams/reference-implementation/brand-checks-expected.txt (modified) (1 diff)
• LayoutTests/streams/reference-implementation/readable-stream-reader-expected.txt (modified) (1 diff)
• Source/WebCore/CMakeLists.txt (modified) (4 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/DerivedSources.make (modified) (1 diff)
• Source/WebCore/Modules/streams/ReadableStream.cpp (deleted)
• Source/WebCore/Modules/streams/ReadableStream.h (deleted)
• Source/WebCore/Modules/streams/ReadableStream.idl (modified) (1 diff)
• Source/WebCore/Modules/streams/ReadableStream.js (modified) (2 diffs)
• Source/WebCore/Modules/streams/ReadableStreamController.h (modified) (1 diff)
• Source/WebCore/Modules/streams/ReadableStreamController.idl (modified) (1 diff)
• Source/WebCore/Modules/streams/ReadableStreamController.js (added)
• Source/WebCore/Modules/streams/ReadableStreamInternals.js (modified) (2 diffs)
• Source/WebCore/Modules/streams/ReadableStreamReader.cpp (deleted)
• Source/WebCore/Modules/streams/ReadableStreamReader.h (modified) (1 diff)
• Source/WebCore/Modules/streams/ReadableStreamReader.idl (modified) (1 diff)
• Source/WebCore/Modules/streams/ReadableStreamReader.js (copied) (copied from trunk/Source/WebCore/Modules/streams/ReadableStream.js) (1 diff)
• Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (modified) (5 diffs)
• Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (modified) (3 diffs)
• Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (17 diffs)
• Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (modified) (1 diff)
• Source/WebCore/bindings/js/JSDOMConstructor.h (added)
• Source/WebCore/bindings/js/JSDOMWindowBase.cpp (modified) (2 diffs)
• Source/WebCore/bindings/js/JSReadableStreamControllerCustom.cpp (deleted)
• Source/WebCore/bindings/js/JSReadableStreamCustom.cpp (deleted)
• Source/WebCore/bindings/js/JSReadableStreamPrivateConstructors.cpp (added)
• Source/WebCore/bindings/js/JSReadableStreamPrivateConstructors.h (added)
• Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp (deleted)
• Source/WebCore/bindings/js/ReadableJSStream.cpp (deleted)
• Source/WebCore/bindings/js/ReadableJSStream.h (deleted)
• Source/WebCore/bindings/js/WebCoreBuiltinNames.h (added)
• Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp (modified) (1 diff)
• Source/WebCore/bindings/js/WebCoreJSClientData.h (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-10-05  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        Migrate streams API to JS Builtins
+        https://bugs.webkit.org/show_bug.cgi?id=147092
+
+        Reviewed by Darin Adler.
+
+        Rebasing some tests, one subtest passing, two others still failing but with different reasons.
+
+        * streams/reference-implementation/brand-checks-expected.txt:
+        * streams/reference-implementation/readable-stream-reader-expected.txt:
+
 2015-10-05  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/streams/reference-implementation/brand-checks-expected.txt

@@ -5 +5 @@
 FAIL ReadableStream.prototype.getReader enforces a brand check Can't find variable: WritableStream
 PASS ReadableStream.prototype.pipeThrough works generically on its this and its arguments 
-FAIL ReadableStream.prototype.pipeTo works generically on its this and its arguments Can only call ReadableStream.pipeTo on instances of ReadableStream
+FAIL ReadableStream.prototype.pipeTo works generically on its this and its arguments pipeTo is not implemented
 FAIL ReadableStream.prototype.tee enforces a brand check Can't find variable: WritableStream
 PASS ReadableStreamReader enforces a brand check on its argument 
-FAIL ReadableStreamReader.prototype.closed enforces a brand check undefined is not an object (evaluating 'Object.getOwnPropertyDescriptor(obj, getterName).get')
+PASS ReadableStreamReader.prototype.closed enforces a brand check 
 PASS ReadableStreamReader.prototype.cancel enforces a brand check 
 PASS ReadableStreamReader.prototype.read enforces a brand check 

trunk/LayoutTests/streams/reference-implementation/readable-stream-reader-expected.txt

@@ -2 +2 @@
 PASS Can get the ReadableStreamReader constructor indirectly 
 PASS ReadableStreamReader constructor should get a ReadableStream object as argument 
-FAIL ReadableStreamReader instances should have the correct list of properties assert_array_equals: lengths differ, expected 5 got 4
+FAIL ReadableStreamReader instances should have the correct list of properties assert_equals: method should be non-enumerable expected false but got true
 PASS ReadableStreamReader closed should always return the same promise object 
 PASS Constructing a ReadableStreamReader directly should fail if the stream is already locked (via direct construction) 

trunk/Source/WebCore/CMakeLists.txt

@@ -980 +980 @@
     Modules/speech/SpeechSynthesisVoice.cpp
 
-    Modules/streams/ReadableStream.cpp
-    Modules/streams/ReadableStreamReader.cpp
-
     Modules/vibration/NavigatorVibration.cpp
     Modules/vibration/Vibration.cpp
@@ -1209 +1206 @@
     bindings/js/JSPluginElementFunctions.cpp
     bindings/js/JSPopStateEventCustom.cpp
+    bindings/js/JSReadableStreamPrivateConstructors.cpp
     bindings/js/JSRTCIceCandidateCustom.cpp
     bindings/js/JSRTCPeerConnectionCustom.cpp
     bindings/js/JSRTCSessionDescriptionCustom.cpp
     bindings/js/JSRTCStatsResponseCustom.cpp
-    bindings/js/JSReadableStreamControllerCustom.cpp
-    bindings/js/JSReadableStreamCustom.cpp
-    bindings/js/JSReadableStreamReaderCustom.cpp
     bindings/js/JSSQLResultSetRowListCustom.cpp
     bindings/js/JSSQLTransactionCustom.cpp
@@ -1242 +1237 @@
     bindings/js/JSXPathResultCustom.cpp
     bindings/js/JSXSLTProcessorCustom.cpp
-    bindings/js/ReadableJSStream.cpp
     bindings/js/ScheduledAction.cpp
     bindings/js/ScriptCachedFrameData.cpp
@@ -3356 +3350 @@
     ${WEBCORE_DIR}/Modules/streams/CountQueuingStrategy.js
     ${WEBCORE_DIR}/Modules/streams/ReadableStream.js
+    ${WEBCORE_DIR}/Modules/streams/ReadableStreamController.js
     ${WEBCORE_DIR}/Modules/streams/ReadableStreamInternals.js
+    ${WEBCORE_DIR}/Modules/streams/ReadableStreamReader.js
 )
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-10-05  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        Migrate streams API to JS Builtins
+        https://bugs.webkit.org/show_bug.cgi?id=147092
+
+        Reviewed by Darin Adler.
+
+        Moved ReadableStream implementation from C++ to JS Builtins.
+        Created specific private constructors for ReadableStreamReader and ReadableStreamController.
+        Added these constructors to  JSDOMWindowBase.
+        Constructors are based on a template found in JSDOMConstructor which might serve to webidl-generated classes as well.
+
+        Covered by existing tests.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * Modules/streams/ReadableStream.cpp: Removed.
+        * Modules/streams/ReadableStream.h: Removed.
+        * Modules/streams/ReadableStream.idl:
+        * Modules/streams/ReadableStream.js:
+        (strategy.size):
+        (initializeReadableStream):
+        (cancel):
+        (getReader):
+        (pipeTo):
+        (tee):
+        (locked):
+        * Modules/streams/ReadableStreamController.h:
+        * Modules/streams/ReadableStreamController.idl:
+        * Modules/streams/ReadableStreamController.js: Added.
+        (enqueue):
+        (error):
+        (close):
+        (desiredSize):
+        * Modules/streams/ReadableStreamInternals.js:
+        (privateInitializeReadableStreamReader):
+        (privateInitializeReadableStreamController):
+        (isReadableStream):
+        (isReadableStreamReader):
+        (isReadableStreamController):
+        (errorReadableStream):
+        (requestReadableStreamPull):
+        (getReadableStreamDesiredSize):
+        (releaseReadableStreamReader):
+        (cancelReadableStream):
+        (finishClosingReadableStream):
+        (closeReadableStream):
+        (closeReadableStreamReader):
+        (enqueueInReadableStream):
+        (readFromReadableStreamReader):
+        (invokeOrNoop):
+        (promiseInvokeOrNoop):
+        * Modules/streams/ReadableStreamReader.cpp: Removed.
+        * Modules/streams/ReadableStreamReader.h:
+        * Modules/streams/ReadableStreamReader.idl:
+        * Modules/streams/ReadableStreamReader.js: Copied from Source/WebCore/Modules/streams/ReadableStream.js.
+        (cancel):
+        (read):
+        (releaseLock):
+        (closed):
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSBindingsAllInOne.cpp:
+        * bindings/js/JSDOMConstructor.h: Added.
+        (WebCore::JSBuiltinConstructor::create):
+        (WebCore::JSBuiltinConstructor::createStructure):
+        (WebCore::JSBuiltinConstructor::JSBuiltinConstructor):
+        (WebCore::JSBuiltinConstructor::initializeProperties):
+        (WebCore::JSBuiltinConstructor<JSClass>::finishCreation):
+        (WebCore::JSBuiltinConstructor<JSClass>::construct):
+        (WebCore::JSBuiltinConstructor<JSClass>::getConstructData):
+        * bindings/js/JSDOMWindowBase.cpp:
+        (WebCore::JSDOMWindowBase::finishCreation):
+        * bindings/js/JSReadableStreamControllerCustom.cpp: Removed.
+        * bindings/js/JSReadableStreamCustom.cpp: Removed.
+        * bindings/js/JSReadableStreamPrivateConstructors.cpp: Added.
+        (WebCore::constructJSReadableStreamController):
+        (WebCore::constructJSReadableStreamReader):
+        (WebCore::JSBuiltinConstructor<JSReadableStreamReader>::createJSObject):
+        (WebCore::JSBuiltinConstructor<JSReadableStreamController>::createJSObject):
+        (WebCore::JSBuiltinReadableStreamReaderPrivateConstructor::createInitializeFunction):
+        (WebCore::JSBuiltinReadableStreamControllerPrivateConstructor::createInitializeFunction):
+        (WebCore::createReadableStreamReaderPrivateConstructor):
+        (WebCore::createReadableStreamControllerPrivateConstructor):
+        * bindings/js/JSReadableStreamPrivateConstructors.h: Added.
+        * bindings/js/JSReadableStreamReaderCustom.cpp: Removed.
+        * bindings/js/ReadableJSStream.cpp: Removed.
+        * bindings/js/ReadableJSStream.h: Removed.
+        * bindings/js/WebCoreBuiltinNames.h: Added.
+        (WebCore::WebCoreBuiltinNames::WebCoreBuiltinNames):
+        * bindings/js/WebCoreJSBuiltins.cpp:
+        * bindings/js/WebCoreJSClientData.h:
+        (WebCore::WebCoreJSClientData::WebCoreJSClientData):
+        (WebCore::WebCoreJSClientData::builtinNames):
+        (WebCore::WebCoreJSClientData::readableStreamControllerBuiltins):
+        (WebCore::WebCoreJSClientData::readableStreamReaderBuiltins):
+
 2015-10-05  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/DerivedSources.make

@@ -1256 +1256 @@
     $(WebCore)/Modules/streams/CountQueuingStrategy.js \
     $(WebCore)/Modules/streams/ReadableStream.js \
+    $(WebCore)/Modules/streams/ReadableStreamController.js \
     $(WebCore)/Modules/streams/ReadableStreamInternals.js \
+    $(WebCore)/Modules/streams/ReadableStreamReader.js \
 #
 

trunk/Source/WebCore/Modules/streams/ReadableStream.idl

@@ -29 +29 @@
 
 [
-    ConstructorCallWith=ScriptState,
-    Constructor([Default=Undefined] optional any source, [Default=Undefined] optional Dictionary strategy),
     Conditional=STREAMS_API,
-    SkipVTableValidation
+    JSBuiltinConstructor
 ] interface ReadableStream {
-    [RaisesException] Promise cancel([Default=Undefined] optional any reason);
-    [RaisesException] ReadableStreamReader getReader();
-    [Custom] Promise pipeTo(any streams, any options);
+    [JSBuiltin] Promise cancel([Default=Undefined] optional any reason);
+    [JSBuiltin] Object getReader();
+    [JSBuiltin] Promise pipeTo(any streams, any options);
     [JSBuiltin] Object pipeThrough(any dest, any options);
     [JSBuiltin] Object tee();
 
-    readonly attribute boolean locked;
+    [JSBuiltin] readonly attribute boolean locked;
 };

trunk/Source/WebCore/Modules/streams/ReadableStream.js

@@ -24 +24 @@
  */
 
+function initializeReadableStream(underlyingSource, strategy)
+{
+    "use strict";
+
+     if (typeof underlyingSource === "undefined")
+         underlyingSource = { };
+     if (typeof strategy === "undefined")
+         strategy = { highWaterMark: 1, size: function() { return 1; } };
+
+    if (!@isObject(underlyingSource))
+        throw new @TypeError("ReadableStream constructor takes an object as first argument");
+
+    if (strategy !== undefined && !@isObject(strategy))
+        throw new @TypeError("ReadableStream constructor takes an object as second argument, if any");
+
+    this.@underlyingSource = underlyingSource;
+
+    this.@queue = [];
+    this.@queueSize = 0;
+    this.@state = @readableStreamReadable;
+    this.@started = false;
+    this.@closeRequested = false;
+    this.@pullAgain = false;
+    this.@pulling = false;
+    this.@reader = undefined;
+    this.@storedError = undefined;
+    this.@controller = new @ReadableStreamController(this);
+    this.@strategySize = strategy.size;
+    this.@highWaterMark = Number(strategy.highWaterMark);
+
+    if (Number.isNaN(this.@highWaterMark))
+        throw new TypeError("highWaterMark parameter is not correct");
+    if (this.@highWaterMark < 0)
+        throw new RangeError("highWaterMark is negative");
+
+    var result = @invokeOrNoop(underlyingSource, "start", [this.@controller]);
+    var _this = this;
+    Promise.resolve(result).then(function() {
+        _this.@started = true;
+        @requestReadableStreamPull(_this);
+    }, function(error) {
+        if (_this.@state === @readableStreamReadable)
+            @errorReadableStream(_this, error);
+    });
+
+    return this;
+}
+
+function cancel(reason)
+{
+    "use strict";
+
+    if (!@isReadableStream(this))
+        return Promise.reject(new @TypeError("Function should be called on a ReadableStream"));
+
+    if (@isReadableStreamLocked(this))
+        return Promise.reject(new @TypeError("ReadableStream is locked"));
+
+    return @cancelReadableStream(this, reason);
+}
+
+function getReader()
+{
+    "use strict";
+
+    if (!@isReadableStream(this))
+        throw new @TypeError("Function should be called on a ReadableStream");
+
+    if (@isReadableStreamLocked(this))
+        throw new @TypeError("ReadableStream is locked");
+
+    return new @ReadableStreamReader(this);
+}
+
 function pipeThrough(streams, options)
 {
@@ -32 +106 @@
 }
 
+function pipeTo(dest)
+{
+    "use strict";
+
+    throw new @TypeError("pipeTo is not implemented");
+}
+
 function tee()
 {
     "use strict";
 
-    // TODO: check this is a ReadableStream
-    return @teeReadableStream(this, false)
+    if (!@isReadableStream(this))
+        throw new @TypeError("Function should be called on a ReadableStream");
+
+    throw new @TypeError("tee is not implemented");
 }
+
+function locked()
+{
+    "use strict";
+
+    if (!@isReadableStream(this))
+        throw new @TypeError("Function should be called on a ReadableStream");
+
+    return @isReadableStreamLocked(this);
+}

trunk/Source/WebCore/Modules/streams/ReadableStreamController.h

@@ -33 +33 @@
 #if ENABLE(STREAMS_API)
 
-#include "ReadableJSStream.h"
+#include <wtf/RefCounted.h>
 
 namespace WebCore {
 
-typedef int ExceptionCode;
-
-// This class is only used for JS source readable streams to allow enqueuing, closing or erroring a readable stream.
-// Its definition is at https://streams.spec.whatwg.org/#rs-controller-class.
-// Note that its constructor is taking a ReadableJSStream as it should only be used for JS sources.
-class ReadableStreamController {
+// This is a dummy class needed as we cannot yet use JSBuiltinConstructor with NoInterfaceObject.
+// Implementation of ReadableStreamController functionality is done in ReadableStreamController.js
+// FIXME: Find a way to remove that class.
+class ReadableStreamController final : public RefCounted<ReadableStreamController> {
 public:
-    explicit ReadableStreamController(ReadableJSStream& stream)
-        : m_stream(stream) { }
-
-    ReadableJSStream& stream() { return m_stream; }
-
-    void error(JSC::ExecState& state, JSC::JSValue value, ExceptionCode& ec) { m_stream.error(state, value, ec); }
-
-    void enqueue(JSC::ExecState& state, JSC::JSValue value) { m_stream.enqueue(state, value); }
-
-    void ref() { m_stream.ref(); }
-    void deref() { m_stream.deref(); }
-
-    void close(ExceptionCode& ec) { m_stream.close(ec); }
-    double desiredSize() const { return m_stream.desiredSize(); }
-
+    static Ref<ReadableStreamController> create() { return adoptRef(* new ReadableStreamController); }
 private:
-    ReadableJSStream& m_stream;
+    ReadableStreamController() { }
 };
 

trunk/Source/WebCore/Modules/streams/ReadableStreamController.idl

@@ -34 +34 @@
     NoInterfaceObject
 ] interface ReadableStreamController {
-    [CallWith=ScriptState] void enqueue([Default=Undefined] optional any chunk);
-    [RaisesException] void close();
-    [CallWith=ScriptState, RaisesException] void error([Default=Undefined] optional any error);
+    [JSBuiltin] void enqueue([Default=Undefined] optional any chunk);
+    [JSBuiltin] void close();
+    [JSBuiltin] void error([Default=Undefined] optional any error);
 
-    readonly attribute double desiredSize;
+    [JSBuiltin] readonly attribute double desiredSize;
 };

trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js

@@ -24 +24 @@
  */
 
+function privateInitializeReadableStreamReader(stream)
+{
+    "use strict";
+
+    if (!@isReadableStream(stream))
+       throw new @TypeError("ReadableStreamReader needs a ReadableStream");
+    if (@isReadableStreamLocked(stream))
+       throw new @TypeError("ReadableStream is locked");
+
+    this.@state = stream.@state;
+    this.@readRequests = [];
+    if (stream.@state === @readableStreamReadable) {
+        this.@ownerReadableStream = stream;
+        this.@storedError = undefined;
+        stream.@reader = this;
+        this.@closedPromise = new Promise(function(resolve, reject) {
+            stream.@reader.@closedPromiseResolve = resolve;
+            stream.@reader.@closedPromiseReject = reject;
+        });
+        return this;
+    }
+    if (stream.@state === @readableStreamClosed) {
+        this.@ownerReadableStream = null;
+        this.@storedError = undefined;
+        this.@closedPromise = Promise.resolve();
+        return this;
+    }
+    // TODO: ASSERT(stream.@state === @readableStreamErrored);
+    this.@ownerReadableStream = null;
+    this.@storedError = stream.@storedError;
+    this.@closedPromise = Promise.reject(stream.@storedError);
+
+    return this;
+}
+
+function privateInitializeReadableStreamController(stream)
+{
+    "use strict";
+
+    if (!@isReadableStream(stream))
+        throw new @TypeError("ReadableStreamController needs a ReadableStream");
+    if (typeof stream.@controller !== "undefined")
+        throw new @TypeError("ReadableStream already has a controller");
+    this.@controlledReadableStream = stream;
+
+    return this;
+}
+
 function teeReadableStream(stream, shouldClone)
 {
@@ -30 +78 @@
     throw new @TypeError("tee is not implemented");
 }
+
+function isReadableStream(stream)
+{
+    "use strict";
+
+    return @isObject(stream) && !!stream.@underlyingSource;
+}
+
+function isReadableStreamReader(reader)
+{
+    "use strict";
+
+    return @isObject(reader) && typeof reader.@ownerReadableStream !== "undefined";
+}
+
+function isReadableStreamController(controller)
+{
+    "use strict";
+
+    return @isObject(controller) && !!controller.@controlledReadableStream;
+}
+
+function errorReadableStream(stream, error)
+{
+    "use strict";
+
+    // TODO: ASSERT(stream.@state === @readableStreamReadable);
+    stream.@queue = [];
+    stream.@storedError = error;
+    stream.@state = @readableStreamErrored;
+
+    if (!stream.@reader)
+        return;
+    var reader = stream.@reader;
+
+    var requests = reader.@readRequests;
+    for (var index = 0, length = requests.length; index < length; ++index)
+        requests[index].reject(error);
+    reader.@readRequests = [];
+
+    @releaseReadableStreamReader(reader);
+    reader.@storedError = error;
+    reader.@state = @readableStreamErrored;
+
+    reader.@closedPromiseReject(error);
+}
+
+function requestReadableStreamPull(stream)
+{
+    "use strict";
+
+    if (stream.@state !== @readableStreamReadable)
+        return;
+    if (stream.@closeRequested)
+        return;
+    if (!stream.@started)
+        return;
+    if ((!@isReadableStreamLocked(stream) || !stream.@reader.@readRequests.length) && @getReadableStreamDesiredSize(stream) <= 0)
+        return;
+ 
+    if (stream.@pulling) {
+        stream.@pullAgain = true;
+        return;
+    }
+
+    stream.@pulling = true;
+
+    var promise = @promiseInvokeOrNoop(stream.@underlyingSource, "pull", [stream.@controller]);
+    promise.then(function() {
+        stream.@pulling = false;
+        if (stream.@pullAgain) {
+            stream.@pullAgain = false;
+            @requestReadableStreamPull(stream);
+        }
+    }, function(error) {
+        @errorReadableStream(stream, error);
+    });
+}
+
+function isReadableStreamLocked(stream)
+{
+   "use strict";
+
+    return !!stream.@reader;
+}
+
+function getReadableStreamDesiredSize(stream)
+{
+   "use strict";
+
+   return stream.@highWaterMark - stream.@queueSize;
+}
+
+function releaseReadableStreamReader(reader)
+{
+    "use strict";
+
+    reader.@ownerReadableStream.@reader = undefined;
+    reader.@ownerReadableStream = null;
+}
+
+function cancelReadableStream(stream, reason)
+{
+    "use strict";
+
+    if (stream.@state === @readableStreamClosed)
+        return Promise.resolve();
+    if (stream.@state === @readableStreamErrored)
+        return Promise.reject(stream.@storedError);
+    stream.@queue = [];
+    @finishClosingReadableStream(stream);
+    return @promiseInvokeOrNoop(stream.@underlyingSource, "cancel", [reason]).then(function() { });
+}
+
+function finishClosingReadableStream(stream)
+{
+    "use strict";
+
+    // TODO: ASSERT(stream.@state ===  @readableStreamReadable);
+    stream.@state = @readableStreamClosed;
+    var reader = stream.@reader;
+    if (reader)
+        @closeReadableStreamReader(reader);
+}
+
+function closeReadableStream(stream)
+{
+    "use strict";
+
+    // TODO. ASSERT(!stream.@closeRequested);
+    // TODO: ASSERT(stream.@state !== @readableStreamErrored);
+    if (stream.@state === @readableStreamClosed)
+        return; 
+    stream.@closeRequested = true;
+    if (!stream.@queue.length)
+        @finishClosingReadableStream(stream);
+}
+
+function closeReadableStreamReader(reader)
+{
+    "use strict";
+
+    var requests = reader.@readRequests;
+    for (var index = 0, length = requests.length; index < length; ++index)
+        requests[index].resolve({value:undefined, done: true});
+    reader.@readRequests = [];
+    @releaseReadableStreamReader(reader);
+    reader.@state = @readableStreamClosed;
+    reader.@closedPromiseResolve();
+}
+
+function enqueueInReadableStream(stream, chunk)
+{
+    "use strict";
+
+    // TODO: ASSERT(!stream.@closeRequested);
+    // TODO: ASSERT(stream.@state !== @readableStreamErrored);
+    if (stream.@state === @readableStreamClosed)
+        return undefined;
+    if (@isReadableStreamLocked(stream) && stream.@reader.@readRequests.length) {
+        stream.@reader.@readRequests.shift().resolve({value: chunk, done: false});
+        @requestReadableStreamPull(stream);
+        return;
+    }
+    try {
+        var size = 1;
+        if (stream.@strategySize) {
+            size = Number(stream.@strategySize(chunk));
+            if (Number.isNaN(size) || size === +Infinity || size < 0)
+                throw new RangeError("Chunk size is not valid");
+        }
+        stream.@queue.push({ value: chunk, size: size });
+        stream.@queueSize += size;
+    }
+    catch(error) {
+        @errorReadableStream(stream, error);
+        throw error;
+    }
+    @requestReadableStreamPull(stream);
+}
+
+function readFromReadableStreamReader(reader)
+{
+    "use strict";
+
+    if (reader.@state === @readableStreamClosed)
+        return Promise.resolve({value: undefined, done: true});
+    if (reader.@state === @readableStreamErrored)
+        return Promise.reject(reader.@storedError);
+    // TODO: ASSERT(!!reader.@ownerReadableStream);
+    // TODO: ASSERT(reader.@ownerReadableStream.@state === @readableStreamReadable);
+    var stream = reader.@ownerReadableStream;
+    if (stream.@queue.length) {
+        var chunk = stream.@queue.shift();
+        stream.@queueSize -= chunk.size;
+        if (!stream.@closeRequested)
+            @requestReadableStreamPull(stream);
+        else if (!stream.@queue.length)
+            @finishClosingReadableStream(stream);
+        return Promise.resolve({value: chunk.value, done: false});
+    }
+    var readRequest = {};
+    var readPromise = new Promise(function(resolve, reject) {
+        readRequest.resolve = resolve;
+        readRequest.reject = reject;
+    });
+    reader.@readRequests.push(readRequest);
+    @requestReadableStreamPull(stream);
+    return readPromise;
+}
+
+function invokeOrNoop(object, key, args)
+{
+    "use strict";
+
+    var method = object[key];
+    if (typeof method === "undefined")
+        return;
+    return method.@apply(object, args);
+}
+
+function promiseInvokeOrNoop(object, key, args)
+{
+    "use strict";
+
+    try {
+        var method = object[key];
+        if (typeof method === "undefined")
+            return Promise.resolve();
+        var result = method.@apply(object, args);
+        return Promise.resolve(result);
+    }
+    catch(error) {
+        return Promise.reject(error);
+    }
+}

trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h

@@ -33 +33 @@
 #if ENABLE(STREAMS_API)
 
-#include "ActiveDOMObject.h"
-#include "ReadableStream.h"
-#include "ScriptWrappable.h"
-#include <functional>
-#include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
 
 namespace WebCore {
 
-typedef int ExceptionCode;
-
-// ReadableStreamReader implements access to ReadableStream from JavaScript.
-// It basically allows access to the ReadableStream iff the ReadableStreamReader instance is the active reader
-// of the ReadableStream.
-// Most of this handling is happening in the custom JS binding of ReadableStreamReader.
-// See https://streams.spec.whatwg.org/#reader-class for more information.
-class ReadableStreamReader {
+// This is a dummy class needed as we cannot yet use JSBuiltinConstructor with NoInterfaceObject.
+// Implementation of ReadableStreamReader functionality is done in ReadableStreamReader.js
+// FIXME: Find a way to remove that class.
+class ReadableStreamReader final : public RefCounted<ReadableStreamReader> {
 public:
-    ReadableStreamReader(ReadableStream& stream)
-        : m_stream(stream) { }
-
-    void cancel(JSC::JSValue, ReadableStream::CancelPromise&&);
-    void closed(ReadableStream::ClosedPromise&&);
-    void read(ReadableStream::ReadPromise&&);
-    void releaseLock(ExceptionCode&);
-
-    void ref() { m_stream.ref(); }
-    void deref() { m_stream.deref(); }
-
+    static Ref<ReadableStreamReader> create() { return adoptRef(* new ReadableStreamReader); }
 private:
-    ReadableStream& m_stream;
+    ReadableStreamReader() { }
 };
 

trunk/Source/WebCore/Modules/streams/ReadableStreamReader.idl

@@ -30 +30 @@
 [
     Conditional=STREAMS_API,
-    CustomConstructor(any properties),
-    NoInterfaceObject,
-    SkipVTableValidation
+    CustomConstructor,
+    ImplementationLacksVTable,
+    NoInterfaceObject
 ] interface ReadableStreamReader {
-    Promise read();
-    Promise cancel([Default=Undefined] optional any reason);
-    [RaisesException] void releaseLock();
+    [JSBuiltin] Promise read();
+    [JSBuiltin] Promise cancel([Default=Undefined] optional any reason);
+    [JSBuiltin] void releaseLock();
 
-    [CustomGetter, CachedAttribute] readonly attribute Promise closed;
+    [JSBuiltin] readonly attribute Promise closed;
 };

trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js

@@ -24 +24 @@
  */
 
-function pipeThrough(streams, options)
+function cancel(reason)
 {
     "use strict";
 
-    this.pipeTo(streams.writable, options);
-    return streams.readable;
+    if (!@isReadableStreamReader(this))
+        return Promise.reject(new @TypeError("Function should be called on a ReadableStreamReader"));
+
+    if (this.@state === @readableStreamClosed)
+        return Promise.resolve();
+
+    if (this.@state === @readableStreamErrored)
+        return Promise.reject(this.@storedError);
+
+    // TODO ASSERT(@isReadableStream(this.@ownerReadableStream));
+    // TODO ASSERT(this.@ownerReadableStream.@state === @readableStreamReadable);
+    return @cancelReadableStream(this.@ownerReadableStream, reason);
 }
 
-function tee()
+function read()
 {
     "use strict";
 
-    // TODO: check this is a ReadableStream
-    return @teeReadableStream(this, false)
+    if (!@isReadableStreamReader(this))
+        return Promise.reject(new @TypeError("Function should be called on a ReadableStreamReader"));
+
+    return @readFromReadableStreamReader(this);
 }
+
+function releaseLock()
+{
+    "use strict";
+
+    if (!@isReadableStreamReader(this))
+        throw new @TypeError("Function should be called on a ReadableStreamReader");
+
+    if (!this.@ownerReadableStream)
+         return;
+
+    if (this.@readRequests.length)
+        throw new @TypeError();
+
+    @closeReadableStreamReader(this);
+}
+
+function closed()
+{
+    "use strict";
+
+    if (!@isReadableStreamReader(this))
+        return Promise.reject(new @TypeError("Callee of closed is not a ReadableStreamReader"));
+
+    return this.@closedPromise;
+}

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -3947 +3947 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\ReadableStreamInternalsBuiltins.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSReadableStreamController.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -6832 +6818 @@
     <ClCompile Include="..\Modules\notifications\NotificationCenter.cpp" />
     <ClCompile Include="..\Modules\notifications\WorkerGlobalScopeNotifications.cpp" />
-    <ClCompile Include="..\Modules\streams\ReadableStream.cpp" />
-    <ClCompile Include="..\Modules\streams\ReadableStreamReader.cpp" />
     <ClCompile Include="..\Modules\webdatabase\ChangeVersionWrapper.cpp" />
     <ClCompile Include="..\Modules\webdatabase\Database.cpp" />
@@ -18540 +18524 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\bindings\js\JSReadableStreamCustom.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\bindings\js\JSReadableStreamControllerCustom.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\bindings\js\JSReadableStreamReaderCustom.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\bindings\js\ReadableJSStream.cpp">
+    <ClCompile Include="..\bindings\js\JSReadableStreamPrivateConstructors.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -20562 +20504 @@
     <ClInclude Include="..\Modules\notifications\WorkerGlobalScopeNotifications.h" />
     <ClInclude Include="..\Modules\plugins\PluginReplacement.h" />
-    <ClInclude Include="..\Modules\streams\ReadableStream.h" />
-    <ClInclude Include="..\Modules\streams\ReadableStreamController.h" />
-    <ClInclude Include="..\Modules\streams\ReadableStreamReader.h" />
     <ClInclude Include="..\Modules\webdatabase\AbstractDatabaseServer.h" />
     <ClInclude Include="..\Modules\webdatabase\ChangeVersionData.h" />
@@ -22463 +22402 @@
     <ClInclude Include="..\bindings\js\JSDictionary.h" />
     <ClInclude Include="..\bindings\js\JSDOMBinding.h" />
+    <ClInclude Include="..\bindings\js\JSDOMConstructor.h" />
     <ClInclude Include="..\bindings\js\JSDOMGlobalObject.h" />
     <ClInclude Include="..\bindings\js\JSDOMGlobalObjectTask.h" />

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="DerivedSources">
@@ -469 +468 @@
       <Filter>Modules\notifications</Filter>
     </ClCompile>
-    <ClCompile Include="..\Modules\streams\ReadableStream.cpp">
-      <Filter>Modules\streams</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Modules\streams\ReadableStreamReader.cpp">
-      <Filter>Modules\streams</Filter>
-    </ClCompile>
     <ClCompile Include="..\Modules\webdatabase\ChangeVersionWrapper.cpp">
       <Filter>Modules\webdatabase</Filter>
@@ -4405 +4398 @@
       <Filter>bindings\js</Filter>
     </ClCompile>
-    <ClCompile Include="..\bindings\js\JSReadableStreamCustom.cpp">
-      <Filter>bindings\js</Filter>
-    </ClCompile>
-    <ClCompile Include="..\bindings\js\JSReadableStreamControllerCustom.cpp">
-      <Filter>bindings\js</Filter>
-    </ClCompile>
-    <ClCompile Include="..\bindings\js\JSReadableStreamReaderCustom.cpp">
-      <Filter>bindings\js</Filter>
-    </ClCompile>
-    <ClCompile Include="..\bindings\js\ReadableJSStream.cpp">
+    <ClCompile Include="..\bindings\js\JSReadableStreamPrivateConstructors.cpp">
       <Filter>bindings\js</Filter>
     </ClCompile>

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -636 +636 @@
                 14DC0D3709FED073007B0235 /* JSNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14DC0D3509FED073007B0235 /* JSNode.cpp */; };
                 14DC0D3809FED073007B0235 /* JSNode.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 14DC0D3609FED073007B0235 /* JSNode.h */; settings = {ATTRIBUTES = (); }; };
+                14DCF3B21B6BE2080062D4C2 /* JSCountQueuingStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14DCF3B01B6BE2080062D4C2 /* JSCountQueuingStrategy.cpp */; };
                 14DCF3B21B6BE2080062D4C3 /* JSByteLengthQueuingStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14DCF3B01B6BE2080062D4C3 /* JSByteLengthQueuingStrategy.cpp */; };
+                14DCF3B31B6BE2080062D4C2 /* JSCountQueuingStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 14DCF3B11B6BE2080062D4C2 /* JSCountQueuingStrategy.h */; };
                 14DCF3B31B6BE2080062D4C3 /* JSByteLengthQueuingStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 14DCF3B11B6BE2080062D4C3 /* JSByteLengthQueuingStrategy.h */; };
-                14DCF3B21B6BE2080062D4C2 /* JSCountQueuingStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14DCF3B01B6BE2080062D4C2 /* JSCountQueuingStrategy.cpp */; };
-                14DCF3B31B6BE2080062D4C2 /* JSCountQueuingStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 14DCF3B11B6BE2080062D4C2 /* JSCountQueuingStrategy.h */; };
                 14E8378409F85D1C00B85AE4 /* JSEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14E8378309F85D1C00B85AE4 /* JSEvent.cpp */; };
                 14E8378E09F85D4F00B85AE4 /* JSEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 14E8378D09F85D4F00B85AE4 /* JSEvent.h */; };
@@ -1486 +1486 @@
                 40ECAE8116B8B68A00C36103 /* JSDOMError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40ECAE8016B8B68A00C36103 /* JSDOMError.cpp */; };
                 410B7E721045FAB000D8224F /* JSMessageEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 410B7E711045FAB000D8224F /* JSMessageEventCustom.cpp */; };
-                41189EF91AD8273700B90A0D /* JSReadableStreamControllerCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41189EF81AD8233C00B90A0D /* JSReadableStreamControllerCustom.cpp */; };
                 411A90421BBAB47A000CF156 /* WebCoreJSBuiltins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 411A90411BBAB46D000CF156 /* WebCoreJSBuiltins.cpp */; };
                 4123081B138C429700BCCFCA /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93F19B1A08245E5A001E9ABC /* WebCore.framework */; };
                 41230913138C42FF00BCCFCA /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8216299029F4FB501000131 /* JavaScriptCore.framework */; };
                 4127D5370F8AAB1D00E424F5 /* ScriptState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4127D5360F8AAB1D00E424F5 /* ScriptState.cpp */; };
+                4129DF851BB5B80700322A16 /* JSReadableStreamPrivateConstructors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4129DF831BB5B7F700322A16 /* JSReadableStreamPrivateConstructors.cpp */; };
+                4129DF861BB5B80C00322A16 /* JSReadableStreamPrivateConstructors.h in Headers */ = {isa = PBXBuildFile; fileRef = 4129DF841BB5B7F700322A16 /* JSReadableStreamPrivateConstructors.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 4138D3351244054800323D33 /* EventContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 4138D3331244054800323D33 /* EventContext.h */; };
                 4138D3361244054800323D33 /* EventContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4138D3341244054800323D33 /* EventContext.cpp */; };
+                413C2C341BC29A8F0075204C /* JSDOMConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = 413C2C331BC29A7B0075204C /* JSDOMConstructor.h */; settings = {ASSET_TAGS = (); }; };
                 415071571685067300C3C7B3 /* SelectorFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 415071551685067300C3C7B3 /* SelectorFilter.cpp */; };
                 415071581685067300C3C7B3 /* SelectorFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 415071561685067300C3C7B3 /* SelectorFilter.h */; };
@@ -1522 +1524 @@
                 418F88040FF957AE0080F045 /* JSAbstractWorker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 418F88020FF957AE0080F045 /* JSAbstractWorker.cpp */; };
                 418F88050FF957AF0080F045 /* JSAbstractWorker.h in Headers */ = {isa = PBXBuildFile; fileRef = 418F88030FF957AE0080F045 /* JSAbstractWorker.h */; };
-                4198BDF01A81142200B22FB5 /* ReadableJSStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4198BDEE1A81123600B22FB5 /* ReadableJSStream.cpp */; };
-                4198BDF11A81143100B22FB5 /* ReadableJSStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 4198BDEF1A81123600B22FB5 /* ReadableJSStream.h */; };
                 419BC2DE1685329900D64D6D /* VisitedLinkState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 419BC2DC1685329900D64D6D /* VisitedLinkState.cpp */; };
                 419BC2DF1685329900D64D6D /* VisitedLinkState.h in Headers */ = {isa = PBXBuildFile; fileRef = 419BC2DD1685329900D64D6D /* VisitedLinkState.h */; };
-                419FAFAE1ABABD08005B828B /* ReadableStreamReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 419FAFAB1ABABCD5005B828B /* ReadableStreamReader.cpp */; };
-                419FAFAF1ABABD0C005B828B /* ReadableStreamReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 419FAFAC1ABABCD5005B828B /* ReadableStreamReader.h */; };
-                419FAFB11ABABDED005B828B /* JSReadableStreamReaderCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 419FAFB01ABABD7B005B828B /* JSReadableStreamReaderCustom.cpp */; };
-                41A023EF1A39DB7A00F722CF /* ReadableStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41A023EB1A39DB7900F722CF /* ReadableStream.cpp */; };
-                41A023F01A39DB7A00F722CF /* ReadableStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 41A023EC1A39DB7900F722CF /* ReadableStream.h */; };
-                41A023F61A39DBCB00F722CF /* JSReadableStreamCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41A023F31A39DBCB00F722CF /* JSReadableStreamCustom.cpp */; };
                 41A3D58E101C152D00316D07 /* DedicatedWorkerThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41A3D58C101C152D00316D07 /* DedicatedWorkerThread.cpp */; };
                 41A3D58F101C152D00316D07 /* DedicatedWorkerThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 41A3D58D101C152D00316D07 /* DedicatedWorkerThread.h */; };
@@ -7841 +7835 @@
                 148AFDA30AF58360008CC700 /* ExceptionHandlers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ExceptionHandlers.h; sourceTree = "<group>"; };
                 148AFDA40AF58360008CC700 /* ExceptionHandlers.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ExceptionHandlers.mm; sourceTree = "<group>"; };
+                148B4FFF1B6904C500C954E4 /* CountQueuingStrategy.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CountQueuingStrategy.idl; sourceTree = "<group>"; };
                 148B4FFF1B6904C500C954E5 /* ByteLengthQueuingStrategy.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ByteLengthQueuingStrategy.idl; sourceTree = "<group>"; };
-                148B4FFF1B6904C500C954E4 /* CountQueuingStrategy.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CountQueuingStrategy.idl; sourceTree = "<group>"; };
                 14947FFB12F80CD200A0F631 /* DocumentOrderedMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentOrderedMap.cpp; sourceTree = "<group>"; };
                 14947FFC12F80CD200A0F631 /* DocumentOrderedMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentOrderedMap.h; sourceTree = "<group>"; };
@@ -7865 +7859 @@
                 14DC0D3509FED073007B0235 /* JSNode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSNode.cpp; sourceTree = "<group>"; };
                 14DC0D3609FED073007B0235 /* JSNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSNode.h; sourceTree = "<group>"; };
+                14DCF3B01B6BE2080062D4C2 /* JSCountQueuingStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCountQueuingStrategy.cpp; sourceTree = "<group>"; };
                 14DCF3B01B6BE2080062D4C3 /* JSByteLengthQueuingStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSByteLengthQueuingStrategy.cpp; sourceTree = "<group>"; };
+                14DCF3B11B6BE2080062D4C2 /* JSCountQueuingStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCountQueuingStrategy.h; sourceTree = "<group>"; };
                 14DCF3B11B6BE2080062D4C3 /* JSByteLengthQueuingStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSByteLengthQueuingStrategy.h; sourceTree = "<group>"; };
-                14DCF3B01B6BE2080062D4C2 /* JSCountQueuingStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCountQueuingStrategy.cpp; sourceTree = "<group>"; };
-                14DCF3B11B6BE2080062D4C2 /* JSCountQueuingStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCountQueuingStrategy.h; sourceTree = "<group>"; };
                 14E836D209F8512000B85AE4 /* Event.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Event.idl; sourceTree = "<group>"; };
                 14E8378309F85D1C00B85AE4 /* JSEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSEvent.cpp; sourceTree = "<group>"; };
@@ -8769 +8763 @@
                 40ECAE8016B8B68A00C36103 /* JSDOMError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMError.cpp; sourceTree = "<group>"; };
                 410B7E711045FAB000D8224F /* JSMessageEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMessageEventCustom.cpp; sourceTree = "<group>"; };
-                41189EF61AD8232800B90A0D /* ReadableStreamController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamController.h; sourceTree = "<group>"; };
                 41189EF71AD8232800B90A0D /* ReadableStreamController.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadableStreamController.idl; sourceTree = "<group>"; };
-                41189EF81AD8233C00B90A0D /* JSReadableStreamControllerCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStreamControllerCustom.cpp; sourceTree = "<group>"; };
                 411A90411BBAB46D000CF156 /* WebCoreJSBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreJSBuiltins.cpp; sourceTree = "<group>"; };
                 4127D5360F8AAB1D00E424F5 /* ScriptState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptState.cpp; sourceTree = "<group>"; };
+                4129DF811BB5B79B00322A16 /* ReadableStreamController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamController.h; sourceTree = "<group>"; };
+                4129DF821BB5B7A600322A16 /* ReadableStreamReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamReader.h; sourceTree = "<group>"; };
+                4129DF831BB5B7F700322A16 /* JSReadableStreamPrivateConstructors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStreamPrivateConstructors.cpp; sourceTree = "<group>"; };
+                4129DF841BB5B7F700322A16 /* JSReadableStreamPrivateConstructors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSReadableStreamPrivateConstructors.h; sourceTree = "<group>"; };
                 4138D3331244054800323D33 /* EventContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventContext.h; sourceTree = "<group>"; };
                 4138D3341244054800323D33 /* EventContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventContext.cpp; sourceTree = "<group>"; };
+                413C2C331BC29A7B0075204C /* JSDOMConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMConstructor.h; sourceTree = "<group>"; };
                 415071551685067300C3C7B3 /* SelectorFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectorFilter.cpp; sourceTree = "<group>"; };
                 415071561685067300C3C7B3 /* SelectorFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectorFilter.h; sourceTree = "<group>"; };
@@ -8806 +8803 @@
                 418F88020FF957AE0080F045 /* JSAbstractWorker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAbstractWorker.cpp; sourceTree = "<group>"; };
                 418F88030FF957AE0080F045 /* JSAbstractWorker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAbstractWorker.h; sourceTree = "<group>"; };
-                4198BDEE1A81123600B22FB5 /* ReadableJSStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadableJSStream.cpp; sourceTree = "<group>"; };
-                4198BDEF1A81123600B22FB5 /* ReadableJSStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableJSStream.h; sourceTree = "<group>"; };
                 419BC2DC1685329900D64D6D /* VisitedLinkState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkState.cpp; sourceTree = "<group>"; };
                 419BC2DD1685329900D64D6D /* VisitedLinkState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkState.h; sourceTree = "<group>"; };
-                419FAFAB1ABABCD5005B828B /* ReadableStreamReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadableStreamReader.cpp; sourceTree = "<group>"; };
-                419FAFAC1ABABCD5005B828B /* ReadableStreamReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamReader.h; sourceTree = "<group>"; };
                 419FAFAD1ABABCD5005B828B /* ReadableStreamReader.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadableStreamReader.idl; sourceTree = "<group>"; };
-                419FAFB01ABABD7B005B828B /* JSReadableStreamReaderCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStreamReaderCustom.cpp; sourceTree = "<group>"; };
-                41A023EB1A39DB7900F722CF /* ReadableStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadableStream.cpp; sourceTree = "<group>"; };
-                41A023EC1A39DB7900F722CF /* ReadableStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStream.h; sourceTree = "<group>"; };
                 41A023ED1A39DB7900F722CF /* ReadableStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadableStream.idl; sourceTree = "<group>"; };
-                41A023F31A39DBCB00F722CF /* JSReadableStreamCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStreamCustom.cpp; sourceTree = "<group>"; };
                 41A3D58C101C152D00316D07 /* DedicatedWorkerThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DedicatedWorkerThread.cpp; sourceTree = "<group>"; };
                 41A3D58D101C152D00316D07 /* DedicatedWorkerThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DedicatedWorkerThread.h; sourceTree = "<group>"; };
@@ -16278 +16267 @@
                         children = (
                                 148B4FFF1B6904C500C954E5 /* ByteLengthQueuingStrategy.idl */,
+                                4129DF821BB5B7A600322A16 /* ReadableStreamReader.h */,
+                                4129DF811BB5B79B00322A16 /* ReadableStreamController.h */,
                                 148B4FFF1B6904C500C954E4 /* CountQueuingStrategy.idl */,
-                                41A023EB1A39DB7900F722CF /* ReadableStream.cpp */,
-                                41A023EC1A39DB7900F722CF /* ReadableStream.h */,
                                 41A023ED1A39DB7900F722CF /* ReadableStream.idl */,
-                                41189EF61AD8232800B90A0D /* ReadableStreamController.h */,
                                 41189EF71AD8232800B90A0D /* ReadableStreamController.idl */,
-                                419FAFAB1ABABCD5005B828B /* ReadableStreamReader.cpp */,
-                                419FAFAC1ABABCD5005B828B /* ReadableStreamReader.h */,
                                 419FAFAD1ABABCD5005B828B /* ReadableStreamReader.idl */,
                         );
@@ -21629 +21615 @@
                                 93B70D4709EB0C7C009D8468 /* JSDOMBinding.cpp */,
                                 93B70D4809EB0C7C009D8468 /* JSDOMBinding.h */,
+                                413C2C331BC29A7B0075204C /* JSDOMConstructor.h */,
                                 E1C36CBC0EB08062007410BC /* JSDOMGlobalObject.cpp */,
                                 E1C36C020EB076D6007410BC /* JSDOMGlobalObject.h */,
@@ -21657 +21644 @@
                                 93B70D4F09EB0C7C009D8468 /* JSPluginElementFunctions.cpp */,
                                 93B70D5009EB0C7C009D8468 /* JSPluginElementFunctions.h */,
-                                41189EF81AD8233C00B90A0D /* JSReadableStreamControllerCustom.cpp */,
+                                4129DF831BB5B7F700322A16 /* JSReadableStreamPrivateConstructors.cpp */,
+                                4129DF841BB5B7F700322A16 /* JSReadableStreamPrivateConstructors.h */,
                                 E1C36D320EB0A094007410BC /* JSWorkerGlobalScopeBase.cpp */,
                                 E1C36D330EB0A094007410BC /* JSWorkerGlobalScopeBase.h */,
                                 E38838941BAD145F00D62EE3 /* JSModuleLoader.cpp */,
                                 E38838951BAD145F00D62EE3 /* JSModuleLoader.h */,
-                                4198BDEE1A81123600B22FB5 /* ReadableJSStream.cpp */,
-                                4198BDEF1A81123600B22FB5 /* ReadableJSStream.h */,
                                 BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */,
                                 BCA378BB0D15F64200B793D6 /* ScheduledAction.h */,
@@ -21832 +21818 @@
                                 FD8AA63D169514A700D2EA68 /* JSPannerNodeCustom.cpp */,
                                 A85F22081430377D007CC884 /* JSPopStateEventCustom.cpp */,
-                                41A023F31A39DBCB00F722CF /* JSReadableStreamCustom.cpp */,
-                                419FAFB01ABABD7B005B828B /* JSReadableStreamReaderCustom.cpp */,
                                 4AE0BF881836083100F3852D /* JSRTCIceCandidateCustom.cpp */,
                                 07CA120D182D67D800D12197 /* JSRTCPeerConnectionCustom.cpp */,
@@ -26012 +25996 @@
                                 B2FA3D510AB75A6F000E5AC4 /* JSSVGAnimatedTransformList.h in Headers */,
                                 B2FA3D530AB75A6F000E5AC4 /* JSSVGAnimateElement.h in Headers */,
+                                413C2C341BC29A8F0075204C /* JSDOMConstructor.h in Headers */,
                                 4496E39E1398136C003EE32A /* JSSVGAnimateMotionElement.h in Headers */,
                                 B2FA3D550AB75A6F000E5AC4 /* JSSVGAnimateTransformElement.h in Headers */,
@@ -26417 +26402 @@
                                 CDF2B0111820540600F2B424 /* MockBox.h in Headers */,
                                 CDF2B0131820540600F2B424 /* MockMediaPlayerMediaSource.h in Headers */,
+                                4129DF861BB5B80C00322A16 /* JSReadableStreamPrivateConstructors.h in Headers */,
                                 CDF2B0151820540600F2B424 /* MockMediaSourcePrivate.h in Headers */,
                                 4A0FFA9E1AAF5E7E0062803B /* MockRealtimeMediaSourceCenter.h in Headers */,
@@ -26684 +26670 @@
                                 6E84E9E117668BF100815B68 /* RasterShape.h in Headers */,
                                 A84D827C11D333ED00972990 /* RawDataDocumentParser.h in Headers */,
-                                4198BDF11A81143100B22FB5 /* ReadableJSStream.h in Headers */,
-                                41A023F01A39DB7A00F722CF /* ReadableStream.h in Headers */,
-                                419FAFAF1ABABD0C005B828B /* ReadableStreamReader.h in Headers */,
                                 FD31603C12B0267600C1A359 /* RealtimeAnalyser.h in Headers */,
                                 4A4F65711AA997F100E38CDD /* RealtimeMediaSource.h in Headers */,
@@ -29593 +29576 @@
                                 7C4C96DC1AD4483500365A50 /* JSReadableStream.cpp in Sources */,
                                 6C4C96DE1AD4483500365A50 /* JSReadableStreamController.cpp in Sources */,
-                                41189EF91AD8273700B90A0D /* JSReadableStreamControllerCustom.cpp in Sources */,
-                                41A023F61A39DBCB00F722CF /* JSReadableStreamCustom.cpp in Sources */,
                                 7C4C96DE1AD4483500365A50 /* JSReadableStreamReader.cpp in Sources */,
-                                419FAFB11ABABDED005B828B /* JSReadableStreamReaderCustom.cpp in Sources */,
                                 BCFE2F110C1B58370020235F /* JSRect.cpp in Sources */,
                                 4998AECD13F9D6C90090B1AA /* JSRequestAnimationFrameCallback.cpp in Sources */,
@@ -30107 +30087 @@
                                 BCEF43E00E674110001C1287 /* NinePieceImage.cpp in Sources */,
                                 A8C4A80009D563270003AC8D /* Node.cpp in Sources */,
+                                4129DF851BB5B80700322A16 /* JSReadableStreamPrivateConstructors.cpp in Sources */,
                                 854FE7320A2297BE0058D7AD /* NodeFilterCondition.cpp in Sources */,
                                 854FE7340A2297BE0058D7AD /* NodeIterator.cpp in Sources */,
@@ -30249 +30230 @@
                                 F55B3DCD1251F12D003EF269 /* RangeInputType.cpp in Sources */,
                                 6E84E9E017668BEE00815B68 /* RasterShape.cpp in Sources */,
-                                4198BDF01A81142200B22FB5 /* ReadableJSStream.cpp in Sources */,
-                                41A023EF1A39DB7A00F722CF /* ReadableStream.cpp in Sources */,
-                                419FAFAE1ABABD08005B828B /* ReadableStreamReader.cpp in Sources */,
                                 FD31603B12B0267600C1A359 /* RealtimeAnalyser.cpp in Sources */,
                                 4A4F65701AA997F100E38CDD /* RealtimeMediaSource.cpp in Sources */,

trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp

@@ -118 +118 @@
 #include "JSPluginElementFunctions.cpp"
 #include "JSPopStateEventCustom.cpp"
-#if ENABLE(STREAMS_API)
-#include "JSReadableStreamControllerCustom.cpp"
-#include "JSReadableStreamCustom.cpp"
-#include "JSReadableStreamReaderCustom.cpp"
-#include "ReadableJSStream.cpp"
-#endif
+#include "JSReadableStreamPrivateConstructors.cpp"
 #include "JSSQLResultSetRowListCustom.cpp"
 #include "JSSQLTransactionCustom.cpp"

trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp

@@ -49 +49 @@
 
 #if ENABLE(STREAMS_API)
+#include "JSReadableStreamPrivateConstructors.h"
 #include "ReadableStreamInternalsBuiltins.h"
 #endif
@@ -89 +90 @@
         GlobalPropertyInfo(vm.propertyNames->window, m_shell, DontDelete | ReadOnly),
 #if ENABLE(STREAMS_API)
+        GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().readableStreamClosedPrivateName(), jsNumber(1), DontDelete | ReadOnly),
+        GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().readableStreamErroredPrivateName(), jsNumber(2), DontDelete | ReadOnly),
+        GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().readableStreamReadablePrivateName(), jsNumber(3), DontDelete | ReadOnly),
+        GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().ReadableStreamControllerPrivateName(), createReadableStreamControllerPrivateConstructor(vm, *this), DontDelete | ReadOnly),
+        GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().ReadableStreamReaderPrivateName(), createReadableStreamReaderPrivateConstructor(vm, *this), DontDelete | ReadOnly),
 #define DECLARE_GLOBAL_STATIC(name)\
         GlobalPropertyInfo(\

trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp

@@ -30 +30 @@
 #include "CountQueuingStrategyBuiltins.cpp"
 #include "ReadableStreamBuiltins.cpp"
+#include "ReadableStreamControllerBuiltins.cpp"
 #include "ReadableStreamInternalsBuiltins.cpp"
+#include "ReadableStreamReaderBuiltins.cpp"
 #endif

trunk/Source/WebCore/bindings/js/WebCoreJSClientData.h

@@ -24 +24 @@
 
 #include "DOMWrapperWorld.h"
+#include "WebCoreBuiltinNames.h"
 #include "WebCoreTypedArrayController.h"
 #include <wtf/HashSet.h>
@@ -32 +33 @@
 #include "CountQueuingStrategyBuiltinsWrapper.h"
 #include "ReadableStreamBuiltinsWrapper.h"
+#include "ReadableStreamControllerBuiltinsWrapper.h"
 #include "ReadableStreamInternalsBuiltinsWrapper.h"
+#include "ReadableStreamReaderBuiltinsWrapper.h"
 #endif
 
@@ -43 +46 @@
 
 public:
+    explicit WebCoreJSClientData(JSC::VM& vm)
+        : m_builtinNames(&vm)
 #if ENABLE(STREAMS_API)
-    explicit WebCoreJSClientData(JSC::VM& vm)
-        : m_readableStreamBuiltins(&vm)
+        , m_readableStreamBuiltins(&vm)
+        , m_readableStreamControllerBuiltins(&vm)
         , m_readableStreamInternalsBuiltins(&vm)
+        , m_readableStreamReaderBuiltins(&vm)
         , m_byteLengthQueuingStrategyBuiltins(&vm)
         , m_countQueuingStrategyBuiltins(&vm)
-#else
-    WebCoreJSClientData(JSC::VM&)
 #endif
     {
@@ -90 +94 @@
     }
 
+    WebCoreBuiltinNames& builtinNames() { return m_builtinNames; }
+
 #if ENABLE(STREAMS_API)
     ReadableStreamBuiltinsWrapper& readableStreamBuiltins() { return m_readableStreamBuiltins; }
+    ReadableStreamControllerBuiltinsWrapper& readableStreamControllerBuiltins() { return m_readableStreamControllerBuiltins; }
     ReadableStreamInternalsBuiltinsWrapper& readableStreamInternalsBuiltins() { return m_readableStreamInternalsBuiltins; }
+    ReadableStreamReaderBuiltinsWrapper& readableStreamReaderBuiltins() { return m_readableStreamReaderBuiltins; }
     ByteLengthQueuingStrategyBuiltinsWrapper& byteLengthQueuingStrategyBuiltins() { return m_byteLengthQueuingStrategyBuiltins; }
     CountQueuingStrategyBuiltinsWrapper& countQueuingStrategyBuiltins() { return m_countQueuingStrategyBuiltins; }
@@ -101 +109 @@
     RefPtr<DOMWrapperWorld> m_normalWorld;
 
+    WebCoreBuiltinNames m_builtinNames;
+
 #if ENABLE(STREAMS_API)
     ReadableStreamBuiltinsWrapper m_readableStreamBuiltins;
+    ReadableStreamControllerBuiltinsWrapper m_readableStreamControllerBuiltins;
     ReadableStreamInternalsBuiltinsWrapper m_readableStreamInternalsBuiltins;
+    ReadableStreamReaderBuiltinsWrapper m_readableStreamReaderBuiltins;
     ByteLengthQueuingStrategyBuiltinsWrapper m_byteLengthQueuingStrategyBuiltins;
     CountQueuingStrategyBuiltinsWrapper m_countQueuingStrategyBuiltins;