Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inline the resolveOrReject helper function at its call-sites in MessageHandler, and rename an error key to reason

Browse Source 
Given that there's only a couple of call-sites, and that the helper function is really simple, it doesn't seem entirely necessary to keep it around. While fewer function calls is always a good thing, in this case the performance impact is small enough to be unmeasurable.

With *one* single exception the code in `MessageHandler` is using `reason` when passing around various Errors, hence this patch also renames an `error` key for consistency.
This commit is contained in:
Jonas Jenwald 2019-09-17 14:11:23 +02:00
parent 0617984b59
commit 4bd79ec4b3
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/shared/message_handler.js
View File

@ -48,14 +48,6 @@ function wrapReason(reason) {
} }
} }
function resolveOrReject(capability, data) {
if (data.success) {
capability.resolve();
} else {
capability.reject(wrapReason(data.reason));
}
}
function MessageHandler(sourceName, targetName, comObj) { function MessageHandler(sourceName, targetName, comObj) {
this.sourceName = sourceName; this.sourceName = sourceName;
this.targetName = targetName; this.targetName = targetName;
@ -80,8 +72,8 @@ function MessageHandler(sourceName, targetName, comObj) {
if (data.callbackId in callbacksCapabilities) { if (data.callbackId in callbacksCapabilities) {
let callback = callbacksCapabilities[callbackId]; let callback = callbacksCapabilities[callbackId];
delete callbacksCapabilities[callbackId]; delete callbacksCapabilities[callbackId];
if ('error' in data) { if ('reason' in data) {
callback.reject(wrapReason(data.error)); callback.reject(wrapReason(data.reason));
} else { } else {
callback.resolve(data.data); callback.resolve(data.data);
} }
@ -109,7 +101,7 @@ function MessageHandler(sourceName, targetName, comObj) {
targetName, targetName,
isReply: true, isReply: true,
callbackId: data.callbackId, callbackId: data.callbackId,
error: wrapReason(reason), reason: wrapReason(reason),
}); });
}); });
} else if (data.streamId) { } else if (data.streamId) {
@ -358,10 +350,20 @@ MessageHandler.prototype = {
switch (data.stream) { switch (data.stream) {
case StreamKind.START_COMPLETE: case StreamKind.START_COMPLETE:
resolveOrReject(this.streamControllers[streamId].startCall, data); if (data.success) {
this.streamControllers[streamId].startCall.resolve();
} else {
this.streamControllers[streamId].startCall.reject(
wrapReason(data.reason));
}
break; break;
case StreamKind.PULL_COMPLETE: case StreamKind.PULL_COMPLETE:
resolveOrReject(this.streamControllers[streamId].pullCall, data); if (data.success) {
this.streamControllers[streamId].pullCall.resolve();
} else {
this.streamControllers[streamId].pullCall.reject(
wrapReason(data.reason));
}
break; break;
case StreamKind.PULL: case StreamKind.PULL:
// Ignore any pull after close is called. // Ignore any pull after close is called.
@ -431,7 +433,12 @@ MessageHandler.prototype = {
deleteStreamController(); deleteStreamController();
break; break;
case StreamKind.CANCEL_COMPLETE: case StreamKind.CANCEL_COMPLETE:
resolveOrReject(this.streamControllers[streamId].cancelCall, data); if (data.success) {
this.streamControllers[streamId].cancelCall.resolve();
} else {
this.streamControllers[streamId].cancelCall.reject(
wrapReason(data.reason));
}
deleteStreamController(); deleteStreamController();
break; break;
case StreamKind.CANCEL: case StreamKind.CANCEL: