Fixes WeakMap polyfill (and improves PDFWorker port check).

mozilla · Jun 13, 2017 · 631e6be · 631e6be
1 parent e5ac64f
commit 631e6be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/display/api.js b/src/display/api.js
@@ -1232,7 +1232,7 @@ var PDFWorker = (function PDFWorkerClosure() {
   let pdfWorkerPorts = new WeakMap();
 
   function PDFWorker(name, port) {
-    if (pdfWorkerPorts.has(port)) {
+    if (port && pdfWorkerPorts.has(port)) {
       throw new Error('Cannot use more than one PDFWorker per port');
     }
 

diff --git a/src/shared/compatibility.js b/src/shared/compatibility.js
@@ -1176,10 +1176,14 @@ PDFJS.compatibilityChecked = true;
   }
   WeakMap.prototype = {
     has(obj) {
+      if ((typeof obj !== 'object' && typeof obj !== 'function') ||
+          obj === null) {
+        return false;
+      }
       return !!Object.getOwnPropertyDescriptor(obj, this.id);
     },
-    get(obj, defaultValue) {
-      return this.has(obj) ? obj[this.id] : defaultValue;
+    get(obj) {
+      return this.has(obj) ? obj[this.id] : undefined;
     },
     set(obj, value) {
       Object.defineProperty(obj, this.id, {