Merge pull request #9611 from Snuffleupagus/getMainThreadWorkerMessag…

…eHandler-non-PRODUCTION Clean-up `getMainThreadWorkerMessageHandler` for non-PRODUCTION mode
mozilla · Mar 31, 2018 · 8512596 · 8512596
2 parents a8e9f6c + 8b09f7c
commit 8512596
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/display/api.js b/src/display/api.js
@@ -1317,13 +1317,7 @@ var PDFWorker = (function PDFWorkerClosure() {
     if (typeof window === 'undefined') {
       return null;
     }
-    if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('PRODUCTION')) {
-      return (window.pdfjsNonProductionPdfWorker &&
-              window.pdfjsNonProductionPdfWorker.WorkerMessageHandler);
-    }
-    // PRODUCTION
-    return (window.pdfjsWorker &&
-            window.pdfjsWorker.WorkerMessageHandler);
+    return (window.pdfjsWorker && window.pdfjsWorker.WorkerMessageHandler);
   }
 
   let fakeWorkerFilesLoadedCapability;

diff --git a/web/app.js b/web/app.js
@@ -1524,11 +1524,11 @@ function loadFakeWorker() {
     if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('PRODUCTION')) {
       if (typeof SystemJS === 'object') {
         SystemJS.import('pdfjs/core/worker').then((worker) => {
-          window.pdfjsNonProductionPdfWorker = worker;
+          window.pdfjsWorker = worker;
           resolve();
         });
       } else if (typeof require === 'function') {
-        window.pdfjsNonProductionPdfWorker = require('../src/core/worker.js');
+        window.pdfjsWorker = require('../src/core/worker.js');
         resolve();
       } else {
         reject(new Error(