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

Merge pull request #8508 from yurydelendik/issue8246

Browse Source 
Fixes duplicate creation of PDFWorker for the same port.
This commit is contained in:
Jonas Jenwald 2017-06-10 14:56:05 +02:00 committed by GitHub
commit 1766fe8184
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/display/api.js
View File

@ -264,7 +264,7 @@ function getDocument(src, pdfDataRangeTransport,
// Worker was not provided -- creating and owning our own. If message port
// is specified in global settings, using it.
var workerPort = getDefaultSetting('workerPort');
worker = workerPort ? new PDFWorker(null, workerPort) : new PDFWorker();
worker = workerPort ? PDFWorker.fromPort(workerPort) : new PDFWorker();
task._worker = worker;
}
var docId = task.docId;
@ -1160,7 +1160,7 @@ class LoopbackPort {
* @class
*/
var PDFWorker = (function PDFWorkerClosure() {
var nextFakeWorkerId = 0;
let nextFakeWorkerId = 0;
function getWorkerSrc() {
if (typeof workerSrc !== 'undefined') {
@ -1177,7 +1177,7 @@ var PDFWorker = (function PDFWorkerClosure() {
error('No PDFJS.workerSrc specified');
}
var fakeWorkerFilesLoadedCapability;
let fakeWorkerFilesLoadedCapability;
// Loads worker code into main thread.
function setupFakeWorkerGlobal() {
@ -1229,7 +1229,13 @@ var PDFWorker = (function PDFWorkerClosure() {
return URL.createObjectURL(new Blob([wrapper]));
}
let pdfWorkerPorts = new WeakMap();
function PDFWorker(name, port) {
if (pdfWorkerPorts.has(port)) {
throw new Error('Cannot use more than one PDFWorker per port');
}
this.name = name;
this.destroyed = false;
@ -1239,6 +1245,7 @@ var PDFWorker = (function PDFWorkerClosure() {
this._messageHandler = null;
if (port) {
pdfWorkerPorts.set(port, this);
this._initializeFromPort(port);
return;
}
@ -1444,6 +1451,13 @@ var PDFWorker = (function PDFWorkerClosure() {
},
};
PDFWorker.fromPort = function (port) {
if (pdfWorkerPorts.has(port)) {
return pdfWorkerPorts.get(port);
}
return new PDFWorker(null, port);
};
return PDFWorker;
})();