Merge pull request #18398 from calixteman/bug1905923

[Editor] Change the enableML pref for enableAltText (bug 1905923)

extensions/chromium/preferences_schema.json

@@ -51,7 +51,7 @@
       "type": "boolean",
       "default": true
     },
-    "enableML": {
+    "enableAltText": {
       "type": "boolean",
       "default": false
     },

src/display/editor/stamp.js

@@ -430,7 +430,7 @@ class StampEditor extends AnnotationEditor {
       return;
     }
     this.#hasMLBeenQueried = true;
-    if (!this._uiManager.hasMLManager || this.hasAltText()) {
+    if (!this._uiManager.isMLEnabledFor("altText") || this.hasAltText()) {
       return;
     }
     const offscreen = new OffscreenCanvas(width, height);

src/display/editor/tools.js

@@ -851,8 +851,8 @@ class AnnotationEditorUIManager {
     return this.#mlManager?.guess(data) || null;
   }
 
-  get hasMLManager() {
+  isMLEnabledFor(name) {
-    return !!this.#mlManager;
+    return !!this.#mlManager?.isEnabledFor(name);
   }
 
   get hcmFilter() {

web/app.js

@@ -756,10 +756,11 @@ const PDFViewerApplication = {
   },
 
   get mlManager() {
+    const enableAltText = AppOptions.get("enableAltText");
     return shadow(
       this,
       "mlManager",
-      AppOptions.get("enableML") === true ? new MLManager() : null
+      enableAltText === true ? new MLManager({ enableAltText }) : null
     );
   },
 

web/app_options.js

@@ -141,6 +141,11 @@ const defaultOptions = {
     value: false,
     kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
   },
+  enableAltText: {
+    /** @type {boolean} */
+    value: false,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
+  },
   enableHighlightEditor: {
     // We'll probably want to make some experiments before enabling this
     // in Firefox release, but it has to be temporary.
@@ -157,11 +162,6 @@ const defaultOptions = {
     value: typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING"),
     kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
   },
-  enableML: {
-    /** @type {boolean} */
-    value: false,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
-  },
   enablePermissions: {
     /** @type {boolean} */
     value: false,

web/chromecom.js

@@ -436,6 +436,10 @@ class ExternalServices extends BaseExternalServices {
 }
 
 class MLManager {
+  isEnabledFor(_name) {
+    return false;
+  }
+
   async guess() {
     return null;
   }

web/firefoxcom.js

@@ -303,6 +303,16 @@ class FirefoxScripting {
 }
 
 class MLManager {
+  #enabled = new Map();
+
+  constructor({ enableAltText }) {
+    this.#enabled.set("altText", enableAltText);
+  }
+
+  isEnabledFor(name) {
+    return this.#enabled.get(name);
+  }
+
   guess(data) {
     return FirefoxCom.requestAsync("mlGuess", data);
   }

web/genericcom.js

@@ -48,6 +48,10 @@ class ExternalServices extends BaseExternalServices {
 }
 
 class MLManager {
+  isEnabledFor(_name) {
+    return false;
+  }
+
   async guess() {
     return null;
   }