Merge pull request #15318 from Snuffleupagus/worker-small-fixes

A couple of small `PDFWorker` changes
This commit is contained in:
Jonas Jenwald 2022-08-15 18:55:29 +02:00 committed by GitHub
commit bf6593372b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2120,11 +2120,10 @@ class PDFWorker {
// Right now, the requirement is, that an Uint8Array is still an // Right now, the requirement is, that an Uint8Array is still an
// Uint8Array as it arrives on the worker. (Chrome added this with v.15.) // Uint8Array as it arrives on the worker. (Chrome added this with v.15.)
if ( if (
typeof Worker !== "undefined" &&
!PDFWorkerUtil.isWorkerDisabled && !PDFWorkerUtil.isWorkerDisabled &&
!PDFWorker._mainThreadWorkerMessageHandler !PDFWorker._mainThreadWorkerMessageHandler
) { ) {
let workerSrc = PDFWorker.workerSrc; let { workerSrc } = PDFWorker;
try { try {
// Wraps workerSrc path into blob URL, if the former does not belong // Wraps workerSrc path into blob URL, if the former does not belong
@ -2299,7 +2298,10 @@ class PDFWorker {
if (GlobalWorkerOptions.workerSrc) { if (GlobalWorkerOptions.workerSrc) {
return GlobalWorkerOptions.workerSrc; return GlobalWorkerOptions.workerSrc;
} }
if (PDFWorkerUtil.fallbackWorkerSrc !== null) { if (
(typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) &&
PDFWorkerUtil.fallbackWorkerSrc !== null
) {
if (!isNodeJS) { if (!isNodeJS) {
deprecated('No "GlobalWorkerOptions.workerSrc" specified.'); deprecated('No "GlobalWorkerOptions.workerSrc" specified.');
} }