Changeset 194035 in webkit

Timestamp:

Dec 14, 2015 9:27:27 AM (8 years ago)

Author:

youenn.fablet@crf.canon.fr

Message:

[Streams API] Directly use @then as much as possible
​https://bugs.webkit.org/show_bug.cgi?id=151631

Reviewed by Darin Adler.

Moved from @Promise.prototype.@then.@call(promise,...) to promise.@then.(...)
for promise objects that are not exposed to user scripts.

Updated promiseInvokeXX stream utility functions to ensure that returned promise always has a @then.
This allows improving the readability of code calling promiseInvokeXX functions.
Changed invokeOrNoop to promiseInvokeOrNoopNoCatch as invokeOrNoop
result is always wrapped as a promise using Promise.resolve.

No change in behavior.

• Modules/streams/ReadableStream.js:

(initializeReadableStream):

• Modules/streams/ReadableStreamInternals.js:

(teeReadableStream):
(teeReadableStreamBranch2CancelFunction):
(cancelReadableStream):

• Modules/streams/StreamInternals.js:

(shieldingPromiseResolve): introduced this routine to ensure the returned promise has a @then property.
(promiseInvokeOrNoopNoCatch):
(promiseInvokeOrNoop):
(promiseInvokeOrFallbackOrNoop):

• Modules/streams/WritableStream.js:

(initializeWritableStream):
(abort):

• Modules/streams/WritableStreamInternals.js:

(callOrScheduleWritableStreamAdvanceQueue):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/streams/ReadableStream.js (modified) (2 diffs)
• Modules/streams/ReadableStreamInternals.js (modified) (5 diffs)
• Modules/streams/StreamInternals.js (modified) (3 diffs)
• Modules/streams/WritableStream.js (modified) (2 diffs)
• Modules/streams/WritableStreamInternals.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-14  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        [Streams API] Directly use @then as much as possible
+        https://bugs.webkit.org/show_bug.cgi?id=151631
+
+        Reviewed by Darin Adler.
+
+        Moved from @Promise.prototype.@then.@call(promise,...) to promise.@then.(...)
+        for promise objects that are not exposed to user scripts.
+
+        Updated promiseInvokeXX stream utility functions to ensure that returned promise always has a @then.
+        This allows improving the readability of code calling promiseInvokeXX functions.
+        Changed invokeOrNoop to promiseInvokeOrNoopNoCatch as invokeOrNoop
+        result is always wrapped as a promise using Promise.resolve.
+
+        No change in behavior.
+
+        * Modules/streams/ReadableStream.js:
+        (initializeReadableStream):
+        * Modules/streams/ReadableStreamInternals.js:
+        (teeReadableStream):
+        (teeReadableStreamBranch2CancelFunction):
+        (cancelReadableStream):
+        * Modules/streams/StreamInternals.js:
+        (shieldingPromiseResolve): introduced this routine to ensure the returned promise has a @then property.
+        (promiseInvokeOrNoopNoCatch):
+        (promiseInvokeOrNoop):
+        (promiseInvokeOrFallbackOrNoop):
+        * Modules/streams/WritableStream.js:
+        (initializeWritableStream):
+        (abort):
+        * Modules/streams/WritableStreamInternals.js:
+        (callOrScheduleWritableStreamAdvanceQueue):
+
 2015-12-14  Xabier Rodriguez Calvar  <calvaris@igalia.com> and Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

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

@@ -56 +56 @@
     this.@strategy = @validateAndNormalizeQueuingStrategy(strategy.size, strategy.highWaterMark);
 
-    const result = @invokeOrNoop(underlyingSource, "start", [this.@controller]);
-    @Promise.prototype.@then.@call(@Promise.@resolve(result), () => {
+    @promiseInvokeOrNoopNoCatch(underlyingSource, "start", [this.@controller]).@then(() => {
         this.@started = true;
         @requestReadableStreamPull(this);
@@ -105 +104 @@
     "use strict";
 
-    // We are not shielding against methods and attributes of the reader and destination as those objects don't have to
-    // be necessarily ReadableStreamReader and WritableStream.
+    // FIXME: rewrite pipeTo so as to require to have 'this' as a ReadableStream and destination be a WritableStream.
+    // See https://github.com/whatwg/streams/issues/407.
+    // We should shield the pipeTo implementation at the same time.
 
     const preventClose = @isObject(options) && !!options.preventClose;

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

@@ -97 +97 @@
     });
 
-    @Promise.prototype.@then.@call(reader.closed, undefined, function(e) {
+    reader.@closedPromiseCapability.@promise.@then(undefined, function(e) {
         if (teeState.closedOrErrored)
             return;
@@ -147 +147 @@
         teeState.reason1 = r;
         if (teeState.canceled2) {
-            @Promise.prototype.@then.@call(@cancelReadableStream(stream, [teeState.reason1, teeState.reason2]),
-                                           teeState.cancelPromiseCapability.@resolve,
-                                           teeState.cancelPromiseCapability.@reject);
+            @cancelReadableStream(stream, [teeState.reason1, teeState.reason2]).@then(
+                teeState.cancelPromiseCapability.@resolve,
+                teeState.cancelPromiseCapability.@reject);
         }
         return teeState.cancelPromiseCapability.@promise;
@@ -163 +163 @@
         teeState.reason2 = r;
         if (teeState.canceled1) {
-            @Promise.prototype.@then.@call(@cancelReadableStream(stream, [teeState.reason1, teeState.reason2]),
-                                           teeState.cancelPromiseCapability.@resolve,
-                                           teeState.cancelPromiseCapability.@reject);
+            @cancelReadableStream(stream, [teeState.reason1, teeState.reason2]).@then(
+                teeState.cancelPromiseCapability.@resolve,
+                teeState.cancelPromiseCapability.@reject);
         }
         return teeState.cancelPromiseCapability.@promise;
@@ -235 +235 @@
     stream.@pulling = true;
 
-    const promise = @promiseInvokeOrNoop(stream.@underlyingSource, "pull", [stream.@controller]);
-    @Promise.prototype.@then.@call(promise, function() {
+    @promiseInvokeOrNoop(stream.@underlyingSource, "pull", [stream.@controller]).@then(function() {
         stream.@pulling = false;
         if (stream.@pullAgain) {
@@ -274 +273 @@
     stream.@queue = @newQueue();
     @finishClosingReadableStream(stream);
-    return @Promise.prototype.@then.@call(@promiseInvokeOrNoop(stream.@underlyingSource, "cancel", [reason]), function() { });
+    return @promiseInvokeOrNoop(stream.@underlyingSource, "cancel", [reason]).@then(function() { });
 }
 

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

@@ -28 +28 @@
 // @internal
 
-function invokeOrNoop(object, key, args)
+function shieldingPromiseResolve(result)
+{
+    const promise = @Promise.@resolve(result);
+    if (promise.@then === undefined)
+        promise.@then = @Promise.prototype.@then;
+    return promise;
+}
+
+function promiseInvokeOrNoopNoCatch(object, key, args)
 {
     "use strict";
 
     const method = object[key];
-    if (typeof method === "undefined")
-        return;
-    return method.@apply(object, args);
+    if (method === undefined)
+        return @Promise.@resolve();
+    return @shieldingPromiseResolve(method.@apply(object, args));
 }
 
@@ -43 +51 @@
 
     try {
-        const method = object[key];
-        if (typeof method === "undefined")
-            return @Promise.@resolve();
-        return @Promise.@resolve(method.@apply(object, args));
+        return @promiseInvokeOrNoopNoCatch(object, key, args);
     }
     catch(error) {
@@ -60 +65 @@
     try {
         const method = object[key1];
-        if (typeof method === "undefined")
-            return @promiseInvokeOrNoop(object, key2, args2);
-        return @Promise.@resolve(method.@apply(object, args1));
+        if (method === undefined)
+            return @promiseInvokeOrNoopNoCatch(object, key2, args2);
+        return @shieldingPromiseResolve(method.@apply(object, args1));
     }
     catch(error) {

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

@@ -57 +57 @@
         @errorWritableStream(this, e);
     };
-    this.@startedPromise = @Promise.@resolve(@invokeOrNoop(underlyingSink, "start", [errorFunction]));
-    @Promise.prototype.@then.@call(this.@startedPromise, () => {
+    this.@startedPromise = @promiseInvokeOrNoopNoCatch(underlyingSink, "start", [errorFunction]);
+    this.@startedPromise.@then(() => {
         this.@started = true;
         this.@startedPromise = undefined;
@@ -81 +81 @@
     @errorWritableStream(this, reason);
 
-    const sinkAbortPromise = @promiseInvokeOrFallbackOrNoop(this.@underlyingSink, "abort", [reason], "close", []);
-
-    return @Promise.prototype.@then.@call(sinkAbortPromise, function() { });
+    return @promiseInvokeOrFallbackOrNoop(this.@underlyingSink, "abort", [reason], "close", []).@then(function() { });
 }
 

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

@@ -78 +78 @@
 
     if (!stream.@started)
-        @Promise.prototype.@then.@call(stream.@startedPromise, function() { @writableStreamAdvanceQueue(stream); });
+        stream.@startedPromise.@then(function() { @writableStreamAdvanceQueue(stream); });
     else
         @writableStreamAdvanceQueue(stream);
@@ -100 +100 @@
 
     stream.@writing = true;
-    @Promise.prototype.@then.@call(@promiseInvokeOrNoop(stream.@underlyingSink, "write", [writeRecord.chunk]),
+    @promiseInvokeOrNoop(stream.@underlyingSink, "write", [writeRecord.chunk]).@then(
         function() {
             if (stream.@state === @streamErrored)
@@ -121 +121 @@
 
     @assert(stream.@state === @streamClosing);
-    @Promise.prototype.@then.@call(@promiseInvokeOrNoop(stream.@underlyingSink, "close"),
+    @promiseInvokeOrNoop(stream.@underlyingSink, "close").@then(
         function() {
             if (stream.@state === @streamErrored)