Removes wrapReason from sendStreamRequest and sendStreamResponse

mozilla · Jul 27, 2017 · 288e9c1 · 288e9c1
1 parent ddb481e
commit 288e9c1
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/shared/util.js b/src/shared/util.js
@@ -1447,7 +1447,6 @@ MessageHandler.prototype = {
 
     let sendStreamRequest = ({ stream, chunk, transfers,
                                success, reason, }) => {
-      reason = wrapReason(reason);
       this.postMessage({ sourceName, targetName, stream, streamId,
                          chunk, success, reason, }, transfers);
     };
@@ -1509,7 +1508,6 @@ MessageHandler.prototype = {
     let streamId = data.streamId;
 
     let sendStreamResponse = ({ stream, success, reason, }) => {
-      reason = wrapReason(reason);
       this.comObj.postMessage({ sourceName, targetName, stream,
                                 success, streamId, reason, });
     };
@@ -1531,11 +1529,11 @@ MessageHandler.prototype = {
     switch (data.stream) {
       case 'start_complete':
         resolveOrReject(this.streamControllers[data.streamId].startCall,
-                        data.success, data.reason);
+                        data.success, wrapReason(data.reason));
         break;
       case 'pull_complete':
         resolveOrReject(this.streamControllers[data.streamId].pullCall,
-                        data.success, data.reason);
+                        data.success, wrapReason(data.reason));
         break;
       case 'pull':
         // Ignore any pull after close is called.
@@ -1579,27 +1577,28 @@ MessageHandler.prototype = {
       case 'error':
         assert(this.streamControllers[data.streamId],
                'error should have stream controller');
-        let reason = wrapReason(data.reason);
-        this.streamControllers[data.streamId].controller.error(reason);
+        this.streamControllers[data.streamId].controller.
+          error(wrapReason(data.reason));
         deleteStreamController();
         break;
       case 'cancel_complete':
         resolveOrReject(this.streamControllers[data.streamId].cancelCall,
-                        data.success, data.reason);
+                        data.success, wrapReason(data.reason));
         deleteStreamController();
         break;
       case 'cancel':
         if (!this.streamSinks[data.streamId]) {
           break;
         }
         resolveCall(this.streamSinks[data.streamId].onCancel,
-                    [data.reason]).then(() => {
+                    [wrapReason(data.reason)]).then(() => {
           sendStreamResponse({ stream: 'cancel_complete', success: true, });
         }, (reason) => {
           sendStreamResponse({ stream: 'cancel_complete',
                                success: false, reason, });
         });
-        this.streamSinks[data.streamId].sinkCapability.reject(data.reason);
+        this.streamSinks[data.streamId].sinkCapability.
+          reject(wrapReason(data.reason));
         this.streamSinks[data.streamId].isCancelled = true;
         delete this.streamSinks[data.streamId];
         break;