Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes duplicate creation of PDFWorker for the same port. #8508

Merged
merged 1 commit into from
Jun 10, 2017
Merged

Fixes duplicate creation of PDFWorker for the same port. #8508

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/display/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -1160,7 +1160,7 @@ class LoopbackPort {
* @class
*/
var PDFWorker = (function PDFWorkerClosure() {
var nextFakeWorkerId = 0;
let nextFakeWorkerId = 0;

function getWorkerSrc() {
if (typeof workerSrc !== 'undefined') {
Expand All @@ -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() {
Expand Down Expand Up @@ -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;

Expand All @@ -1239,6 +1245,7 @@ var PDFWorker = (function PDFWorkerClosure() {
this._messageHandler = null;

if (port) {
pdfWorkerPorts.set(port, this);
this._initializeFromPort(port);
return;
}
Expand Down Expand Up @@ -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;
})();

Expand Down