akira
/
pdfjs-dist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Refactors MessageHandler.send to remove callbacks

Yury Delendik 11 years ago
parent
6ea118b8d7
commit
2008f74185
5 changed files with 148 additions and 167 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/core/evaluator.js
  2. 11
      src/core/image.js
  3. 63
      src/core/worker.js
  4. 161
      src/display/api.js
  5. 76
      src/shared/util.js

4
src/core/evaluator.js
Unescape View File

@ -214,7 +214,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
then(function(imageObj) { then(function(imageObj) {
var imgData = imageObj.createImageData(/* forceRGBA = */ false); var imgData = imageObj.createImageData(/* forceRGBA = */ false);
self.handler.send('obj', [objId, self.pageIndex, 'Image', imgData], self.handler.send('obj', [objId, self.pageIndex, 'Image', imgData],
null, [imgData.data.buffer]); [imgData.data.buffer]);
}).then(null, function (reason) { }).then(null, function (reason) {
warn('Unable to decode image: ' + reason); warn('Unable to decode image: ' + reason);
self.handler.send('obj', [objId, self.pageIndex, 'Image', null]); self.handler.send('obj', [objId, self.pageIndex, 'Image', null]);
@ -1592,7 +1592,7 @@ var OperatorList = (function OperatorListClosure() {
}, },
pageIndex: this.pageIndex, pageIndex: this.pageIndex,
intent: this.intent intent: this.intent
}, null, transfers); }, transfers);
this.dependencies = {}; this.dependencies = {};
this.fnArray.length = 0; this.fnArray.length = 0;
this.argsArray.length = 0; this.argsArray.length = 0;

11
src/core/image.js
Unescape View File

@ -31,14 +31,11 @@ var PDFImage = (function PDFImageClosure() {
var colorSpace = dict.get('ColorSpace', 'CS'); var colorSpace = dict.get('ColorSpace', 'CS');
colorSpace = ColorSpace.parse(colorSpace, xref, res); colorSpace = ColorSpace.parse(colorSpace, xref, res);
var numComps = colorSpace.numComps; var numComps = colorSpace.numComps;
var resolvePromise; var decodePromise = handler.sendWithPromise('JpegDecode',
handler.send('JpegDecode', [image.getIR(), numComps], function(message) { [image.getIR(), numComps]);
return decodePromise.then(function (message) {
var data = message.data; var data = message.data;
var stream = new Stream(data, 0, data.length, image.dict); return new Stream(data, 0, data.length, image.dict);
resolvePromise(stream);
});
return new Promise(function (resolve) {
resolvePromise = resolve;
}); });
} else { } else {
return Promise.resolve(image); return Promise.resolve(image);

63
src/core/worker.js
Unescape View File

@ -279,60 +279,47 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
}); });
}); });
handler.on('GetPageIndex', function wphSetupGetPageIndex(data, deferred) { handler.on('GetPageIndex', function wphSetupGetPageIndex(data) {
var ref = new Ref(data.ref.num, data.ref.gen); var ref = new Ref(data.ref.num, data.ref.gen);
var catalog = pdfManager.pdfDocument.catalog; var catalog = pdfManager.pdfDocument.catalog;
catalog.getPageIndex(ref).then(function (pageIndex) { return catalog.getPageIndex(ref);
deferred.resolve(pageIndex);
}, deferred.reject);
}); });
handler.on('GetDestinations', handler.on('GetDestinations',
function wphSetupGetDestinations(data, deferred) { function wphSetupGetDestinations(data) {
pdfManager.ensureCatalog('destinations').then(function(destinations) { return pdfManager.ensureCatalog('destinations');
deferred.resolve(destinations);
});
} }
); );
handler.on('GetAttachments', handler.on('GetAttachments',
function wphSetupGetAttachments(data, deferred) { function wphSetupGetAttachments(data) {
pdfManager.ensureCatalog('attachments').then(function(attachments) { return pdfManager.ensureCatalog('attachments');
deferred.resolve(attachments);
}, deferred.reject);
} }
); );
handler.on('GetJavaScript', handler.on('GetJavaScript',
function wphSetupGetJavaScript(data, deferred) { function wphSetupGetJavaScript(data) {
pdfManager.ensureCatalog('javaScript').then(function (js) { return pdfManager.ensureCatalog('javaScript');
deferred.resolve(js);
}, deferred.reject);
} }
); );
handler.on('GetOutline', handler.on('GetOutline',
function wphSetupGetOutline(data, deferred) { function wphSetupGetOutline(data) {
pdfManager.ensureCatalog('documentOutline').then(function (outline) { return pdfManager.ensureCatalog('documentOutline');
deferred.resolve(outline);
}, deferred.reject);
} }
); );
handler.on('GetMetadata', handler.on('GetMetadata',
function wphSetupGetMetadata(data, deferred) { function wphSetupGetMetadata(data) {
Promise.all([pdfManager.ensureDoc('documentInfo'), return Promise.all([pdfManager.ensureDoc('documentInfo'),
pdfManager.ensureCatalog('metadata')]).then( pdfManager.ensureCatalog('metadata')]);
function (results) {
deferred.resolve(results);
}, deferred.reject);
} }
); );
handler.on('GetData', function wphSetupGetData(data, deferred) { handler.on('GetData', function wphSetupGetData(data) {
pdfManager.requestLoadedStream(); pdfManager.requestLoadedStream();
pdfManager.onLoadedStream().then(function(stream) { return pdfManager.onLoadedStream().then(function(stream) {
deferred.resolve(stream.bytes); return stream.bytes;
}); });
}); });
@ -398,29 +385,25 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
}); });
}, this); }, this);
handler.on('GetTextContent', function wphExtractText(data, deferred) { handler.on('GetTextContent', function wphExtractText(data) {
pdfManager.getPage(data.pageIndex).then(function(page) { return pdfManager.getPage(data.pageIndex).then(function(page) {
var pageNum = data.pageIndex + 1; var pageNum = data.pageIndex + 1;
var start = Date.now(); var start = Date.now();
page.extractTextContent().then(function(textContent) { return page.extractTextContent().then(function(textContent) {
deferred.resolve(textContent);
info('text indexing: page=' + pageNum + ' - time=' + info('text indexing: page=' + pageNum + ' - time=' +
(Date.now() - start) + 'ms'); (Date.now() - start) + 'ms');
}, function (e) { return textContent;
// Skip errored pages
deferred.reject(e);
}); });
}); });
}); });
handler.on('Cleanup', function wphCleanup(data, deferred) { handler.on('Cleanup', function wphCleanup(data) {
pdfManager.cleanup(); pdfManager.cleanup();
deferred.resolve(true); return true;
}); });
handler.on('Terminate', function wphTerminate(data, deferred) { handler.on('Terminate', function wphTerminate(data) {
pdfManager.terminate(); pdfManager.terminate();
deferred.resolve();
}); });
} }
}; };

161
src/display/api.js
Unescape View File

@ -546,15 +546,9 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
* object that represent the page text content. * object that represent the page text content.
*/ */
getTextContent: function PDFPageProxy_getTextContent() { getTextContent: function PDFPageProxy_getTextContent() {
return new Promise(function (resolve) { return this.transport.messageHandler.sendWithPromise('GetTextContent', {
this.transport.messageHandler.send('GetTextContent', { pageIndex: this.pageNumber - 1
pageIndex: this.pageNumber - 1 });
},
function textContentCallback(textContent) {
resolve(textContent);
}
);
}.bind(this));
}, },
/** /**
* Destroys resources allocated by the page. * Destroys resources allocated by the page.
@ -682,7 +676,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
// Some versions of Opera throw a DATA_CLONE_ERR on serializing the // Some versions of Opera throw a DATA_CLONE_ERR on serializing the
// typed array. Also, checking if we can use transfers. // typed array. Also, checking if we can use transfers.
try { try {
messageHandler.send('test', testObj, null, [testObj.buffer]); messageHandler.send('test', testObj, [testObj.buffer]);
} catch (ex) { } catch (ex) {
info('Cannot use postMessage transfers'); info('Cannot use postMessage transfers');
testObj[0] = 0; testObj[0] = 0;
@ -707,7 +701,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
this.pageCache = []; this.pageCache = [];
this.pageCapabilities = []; this.pageCapabilities = [];
var self = this; var self = this;
this.messageHandler.send('Terminate', null, function () { this.messageHandler.sendWithPromise('Terminate', null).then(function () {
FontLoader.clear(); FontLoader.clear();
if (self.worker) { if (self.worker) {
self.worker.terminate(); self.worker.terminate();
@ -934,9 +928,9 @@ var WorkerTransport = (function WorkerTransportClosure() {
this.workerReadyCapability.reject(data); this.workerReadyCapability.reject(data);
}, this); }, this);
messageHandler.on('PageError', function transportError(data, intent) { messageHandler.on('PageError', function transportError(data) {
var page = this.pageCache[data.pageNum - 1]; var page = this.pageCache[data.pageNum - 1];
var intentState = page.intentStates[intent]; var intentState = page.intentStates[data.intent];
if (intentState.displayReadyCapability.promise) { if (intentState.displayReadyCapability.promise) {
intentState.displayReadyCapability.reject(data.error); intentState.displayReadyCapability.reject(data.error);
} else { } else {
@ -944,40 +938,47 @@ var WorkerTransport = (function WorkerTransportClosure() {
} }
}, this); }, this);
messageHandler.on('JpegDecode', function(data, deferred) { messageHandler.on('JpegDecode', function(data) {
var imageUrl = data[0]; var imageUrl = data[0];
var components = data[1]; var components = data[1];
if (components != 3 && components != 1) { if (components != 3 && components != 1) {
error('Only 3 component or 1 component can be returned'); return Promise.reject(
new Error('Only 3 component or 1 component can be returned'));
} }
var img = new Image(); return new Promise(function (resolve, reject) {
img.onload = (function messageHandler_onloadClosure() { var img = new Image();
var width = img.width; img.onload = function () {
var height = img.height; var width = img.width;
var size = width * height; var height = img.height;
var rgbaLength = size * 4; var size = width * height;
var buf = new Uint8Array(size * components); var rgbaLength = size * 4;
var tmpCanvas = createScratchCanvas(width, height); var buf = new Uint8Array(size * components);
var tmpCtx = tmpCanvas.getContext('2d'); var tmpCanvas = createScratchCanvas(width, height);
tmpCtx.drawImage(img, 0, 0); var tmpCtx = tmpCanvas.getContext('2d');
var data = tmpCtx.getImageData(0, 0, width, height).data; tmpCtx.drawImage(img, 0, 0);
var i, j; var data = tmpCtx.getImageData(0, 0, width, height).data;
var i, j;
if (components == 3) {
for (i = 0, j = 0; i < rgbaLength; i += 4, j += 3) { if (components == 3) {
buf[j] = data[i]; for (i = 0, j = 0; i < rgbaLength; i += 4, j += 3) {
buf[j + 1] = data[i + 1]; buf[j] = data[i];
buf[j + 2] = data[i + 2]; buf[j + 1] = data[i + 1];
} buf[j + 2] = data[i + 2];
} else if (components == 1) { }
for (i = 0, j = 0; i < rgbaLength; i += 4, j++) { } else if (components == 1) {
buf[j] = data[i]; for (i = 0, j = 0; i < rgbaLength; i += 4, j++) {
buf[j] = data[i];
}
} }
} resolve({ data: buf, width: width, height: height});
deferred.resolve({ data: buf, width: width, height: height}); };
}).bind(this); img.onerror = function () {
img.src = imageUrl; reject(new Error('JpegDecode failed to load image'));
};
img.src = imageUrl;
});
}); });
}, },
@ -1019,13 +1020,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
}, },
getPageIndex: function WorkerTransport_getPageIndexByRef(ref) { getPageIndex: function WorkerTransport_getPageIndexByRef(ref) {
return new Promise(function (resolve) { return this.messageHandler.sendWithPromise('GetPageIndex', { ref: ref });
this.messageHandler.send('GetPageIndex', { ref: ref },
function (pageIndex) {
resolve(pageIndex);
}
);
}.bind(this));
}, },
getAnnotations: function WorkerTransport_getAnnotations(pageIndex) { getAnnotations: function WorkerTransport_getAnnotations(pageIndex) {
@ -1034,71 +1029,43 @@ var WorkerTransport = (function WorkerTransportClosure() {
}, },
getDestinations: function WorkerTransport_getDestinations() { getDestinations: function WorkerTransport_getDestinations() {
return new Promise(function (resolve) { return this.messageHandler.sendWithPromise('GetDestinations', null);
this.messageHandler.send('GetDestinations', null,
function transportDestinations(destinations) {
resolve(destinations);
}
);
}.bind(this));
}, },
getAttachments: function WorkerTransport_getAttachments() { getAttachments: function WorkerTransport_getAttachments() {
return new Promise(function (resolve) { return this.messageHandler.sendWithPromise('GetAttachments', null);
this.messageHandler.send('GetAttachments', null,
function transportAttachments(attachments) {
resolve(attachments);
}
);
}.bind(this));
}, },
getJavaScript: function WorkerTransport_getJavaScript() { getJavaScript: function WorkerTransport_getJavaScript() {
return new Promise(function (resolve) { return this.messageHandler.sendWithPromise('GetJavaScript', null);
this.messageHandler.send('GetJavaScript', null,
function transportJavaScript(js) {
resolve(js);
}
);
}.bind(this));
}, },
getOutline: function WorkerTransport_getOutline() { getOutline: function WorkerTransport_getOutline() {
return new Promise(function (resolve) { return this.messageHandler.sendWithPromise('GetOutline', null);
this.messageHandler.send('GetOutline', null,
function transportOutline(outline) {
resolve(outline);
}
);
}.bind(this));
}, },
getMetadata: function WorkerTransport_getMetadata() { getMetadata: function WorkerTransport_getMetadata() {
return new Promise(function (resolve) { return this.messageHandler.sendWithPromise('GetMetadata', null).
this.messageHandler.send('GetMetadata', null, then(function transportMetadata(results) {
function transportMetadata(results) { return {
resolve({ info: results[0],
info: results[0], metadata: (results[1] ? new PDFJS.Metadata(results[1]) : null)
metadata: (results[1] ? new PDFJS.Metadata(results[1]) : null) };
}); });
}
);
}.bind(this));
}, },
startCleanup: function WorkerTransport_startCleanup() { startCleanup: function WorkerTransport_startCleanup() {
this.messageHandler.send('Cleanup', null, this.messageHandler.sendWithPromise('Cleanup', null).
function endCleanup() { then(function endCleanup() {
for (var i = 0, ii = this.pageCache.length; i < ii; i++) { for (var i = 0, ii = this.pageCache.length; i < ii; i++) {
var page = this.pageCache[i]; var page = this.pageCache[i];
if (page) { if (page) {
page.destroy(); page.destroy();
}
} }
this.commonObjs.clear(); }
FontLoader.clear(); this.commonObjs.clear();
}.bind(this) FontLoader.clear();
); }.bind(this));
} }
}; };
return WorkerTransport; return WorkerTransport;

76
src/shared/util.js
Unescape View File

@ -1366,7 +1366,7 @@ function MessageHandler(name, comObj) {
this.comObj = comObj; this.comObj = comObj;
this.callbackIndex = 1; this.callbackIndex = 1;
this.postMessageTransfers = true; this.postMessageTransfers = true;
var callbacks = this.callbacks = {}; var callbacksCapabilities = this.callbacksCapabilities = {};
var ah = this.actionHandler = {}; var ah = this.actionHandler = {};
ah['console_log'] = [function ahConsoleLog(data) { ah['console_log'] = [function ahConsoleLog(data) {
@ -1383,35 +1383,40 @@ function MessageHandler(name, comObj) {
var data = event.data; var data = event.data;
if (data.isReply) { if (data.isReply) {
var callbackId = data.callbackId; var callbackId = data.callbackId;
if (data.callbackId in callbacks) { if (data.callbackId in callbacksCapabilities) {
var callback = callbacks[callbackId]; var callback = callbacksCapabilities[callbackId];
delete callbacks[callbackId]; delete callbacksCapabilities[callbackId];
callback(data.data); if ('error' in data) {
callback.reject(data.error);
} else {
callback.resolve(data.data);
}
} else { } else {
error('Cannot resolve callback ' + callbackId); error('Cannot resolve callback ' + callbackId);
} }
} else if (data.action in ah) { } else if (data.action in ah) {
var action = ah[data.action]; var action = ah[data.action];
if (data.callbackId) { if (data.callbackId) {
var deferred = {}; Promise.resolve().then(function () {
var promise = new Promise(function (resolve, reject) { return action[0].call(action[1], data.data);
deferred.resolve = resolve; }).then(function (result) {
deferred.reject = reject; comObj.postMessage({
}); isReply: true,
deferred.promise = promise; callbackId: data.callbackId,
promise.then(function(resolvedData) { data: result
});
}, function (reason) {
comObj.postMessage({ comObj.postMessage({
isReply: true, isReply: true,
callbackId: data.callbackId, callbackId: data.callbackId,
data: resolvedData error: reason
}); });
}); });
action[0].call(action[1], data.data, deferred);
} else { } else {
action[0].call(action[1], data.data); action[0].call(action[1], data.data);
} }
} else { } else {
error('Unkown action from worker: ' + data.action); error('Unknown action from worker: ' + data.action);
} }
}; };
} }
@ -1428,19 +1433,48 @@ MessageHandler.prototype = {
* Sends a message to the comObj to invoke the action with the supplied data. * Sends a message to the comObj to invoke the action with the supplied data.
* @param {String} actionName Action to call. * @param {String} actionName Action to call.
* @param {JSON} data JSON data to send. * @param {JSON} data JSON data to send.
* @param {function} [callback] Optional callback that will handle a reply.
* @param {Array} [transfers] Optional list of transfers/ArrayBuffers * @param {Array} [transfers] Optional list of transfers/ArrayBuffers
*/ */
send: function messageHandlerSend(actionName, data, callback, transfers) { send: function messageHandlerSend(actionName, data, transfers) {
var message = { var message = {
action: actionName, action: actionName,
data: data data: data
}; };
if (callback) { this.postMessage(message, transfers);
var callbackId = this.callbackIndex++; },
this.callbacks[callbackId] = callback; /**
message.callbackId = callbackId; * Sends a message to the comObj to invoke the action with the supplied data.
* Expects that other side will callback with the response.
* @param {String} actionName Action to call.
* @param {JSON} data JSON data to send.
* @param {Array} [transfers] Optional list of transfers/ArrayBuffers.
* @param {boolean} withPromise true if response if expected.
* @returns {Promise} Promise to be resolved with response data.
*/
sendWithPromise:
function messageHandlerSendWithPromise(actionName, data, transfers) {
var callbackId = this.callbackIndex++;
var message = {
action: actionName,
data: data,
callbackId: callbackId
};
var capability = createPromiseCapability();
this.callbacksCapabilities[callbackId] = capability;
try {
this.postMessage(message, transfers);
} catch (e) {
capability.reject(e);
} }
return capability.promise;
},
/**
* Sends raw message to the comObj.
* @private
* @param message {Object} Raw message.
* @param transfers List of transfers/ArrayBuffers, or undefined.
*/
postMessage: function (message, transfers) {
if (transfers && this.postMessageTransfers) { if (transfers && this.postMessageTransfers) {
this.comObj.postMessage(message, transfers); this.comObj.postMessage(message, transfers);
} else { } else {

Write Preview
Loading…
Cancel
Save