Merge pull request #17397 from Snuffleupagus/app-createScripting-move…

…-options Re-factor how the `sandboxBundleSrc` option is passed to `PDFScriptingManager`
mozilla · Dec 9, 2023 · 5537298 · 5537298
2 parents 988d3a1 + 92c15a6
commit 5537298
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 28 deletions.
diff --git a/web/app.js b/web/app.js
@@ -110,7 +110,7 @@ class DefaultExternalServices {
     throw new Error("Not implemented: createL10n");
   }
 
-  static createScripting(options) {
+  static createScripting() {
     throw new Error("Not implemented: createScripting");
   }
 
@@ -395,10 +395,6 @@ const PDFViewerApplication = {
 
     const pdfScriptingManager = new PDFScriptingManager({
       eventBus,
-      sandboxBundleSrc:
-        typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC || CHROME")
-          ? AppOptions.get("sandboxBundleSrc")
-          : null,
       externalServices,
       docProperties: this._scriptingDocProperties.bind(this),
     });

diff --git a/web/chromecom.js b/web/chromecom.js
@@ -439,8 +439,8 @@ class ChromeExternalServices extends DefaultExternalServices {
     return new GenericL10n(navigator.language);
   }
 
-  static createScripting({ sandboxBundleSrc }) {
-    return new GenericScripting(sandboxBundleSrc);
+  static createScripting() {
+    return new GenericScripting(AppOptions.get("sandboxBundleSrc"));
   }
 }
 PDFViewerApplication.externalServices = ChromeExternalServices;

diff --git a/web/firefoxcom.js b/web/firefoxcom.js
@@ -402,7 +402,7 @@ class FirefoxExternalServices extends DefaultExternalServices {
     return new L10n(localeProperties, document.l10n);
   }
 
-  static createScripting(options) {
+  static createScripting() {
     return FirefoxScripting;
   }
 

diff --git a/web/genericcom.js b/web/genericcom.js
@@ -51,8 +51,8 @@ class GenericExternalServices extends DefaultExternalServices {
     return new GenericL10n(AppOptions.get("locale"));
   }
 
-  static createScripting({ sandboxBundleSrc }) {
-    return new GenericScripting(sandboxBundleSrc);
+  static createScripting() {
+    return new GenericScripting(AppOptions.get("sandboxBundleSrc"));
   }
 }
 PDFViewerApplication.externalServices = GenericExternalServices;

diff --git a/web/pdf_scripting_manager.component.js b/web/pdf_scripting_manager.component.js
@@ -30,8 +30,8 @@ class PDFScriptingManagerComponents extends PDFScriptingManager {
     }
 
     options.externalServices ||= {
-      createScripting: ({ sandboxBundleSrc }) => {
-        return new GenericScripting(sandboxBundleSrc);
+      createScripting: () => {
+        return new GenericScripting(options.sandboxBundleSrc);
       },
     };
     options.docProperties ||= pdfDocument => {

diff --git a/web/pdf_scripting_manager.js b/web/pdf_scripting_manager.js
@@ -21,8 +21,8 @@ import { PromiseCapability, shadow } from "pdfjs-lib";
 /**
  * @typedef {Object} PDFScriptingManagerOptions
  * @property {EventBus} eventBus - The application event bus.
- * @property {string} sandboxBundleSrc - The path and filename of the scripting
- *   bundle.
+ * @property {string} [sandboxBundleSrc] - The path and filename of the
+ *   scripting bundle.
  * @property {Object} [externalServices] - The factory that is used when
  *   initializing scripting; must contain a `createScripting` method.
  *   PLEASE NOTE: Primarily intended for the default viewer use-case.
@@ -47,25 +47,15 @@ class PDFScriptingManager {
 
   #ready = false;
 
-  #sandboxBundleSrc = null;
-
   #scripting = null;
 
   #willPrintCapability = null;
 
   /**
    * @param {PDFScriptingManagerOptions} options
    */
-  constructor({
-    eventBus,
-    sandboxBundleSrc = null,
-    externalServices = null,
-    docProperties = null,
-  }) {
+  constructor({ eventBus, externalServices = null, docProperties = null }) {
     this.#eventBus = eventBus;
-    if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC || CHROME")) {
-      this.#sandboxBundleSrc = sandboxBundleSrc;
-    }
     this.#externalServices = externalServices;
     this.#docProperties = docProperties;
   }
@@ -421,9 +411,7 @@ class PDFScriptingManager {
     if (this.#scripting) {
       throw new Error("#initScripting: Scripting already exists.");
     }
-    return this.#externalServices.createScripting({
-      sandboxBundleSrc: this.#sandboxBundleSrc,
-    });
+    return this.#externalServices.createScripting();
   }
 
   async #destroyScripting() {