Merge pull request #19584 from calixteman/update_openjpeg1

Fix the build of the openjpeg decoder in order to use an optimized build of the openjpeg library (bug 1951128)
Merge pull request #19544 from hecerinc/hecerinc/viewerCssFF
2026-07-28 01:47:22 +02:00 · 2025-02-28 22:55:46 +01:00 · 2025-02-28 21:27:20 +01:00 · 2025-02-28 21:25:51 +01:00 · 2025-02-25 22:00:32 -08:00
4 changed files with 39 additions and 36 deletions
--- a/external/openjpeg/openjpeg.wasm
+++ b/external/openjpeg/openjpeg.wasm
--- a/gulpfile.mjs
+++ b/gulpfile.mjs
@ -1431,6 +1431,7 @@ gulp.task(
          .pipe(
            postcss([
              discardCommentsCSS(),
+              postcssDarkThemeClass(),
              autoprefixer(MOZCENTRAL_AUTOPREFIXER_CONFIG),
            ])
          )
@ -1441,6 +1442,7 @@ gulp.task(
          .pipe(
            postcss([
              discardCommentsCSS(),
+              postcssDarkThemeClass(),
              autoprefixer(MOZCENTRAL_AUTOPREFIXER_CONFIG),
            ])
          )
--- a/web/app.js
+++ b/web/app.js
@ -202,39 +202,40 @@ const PDFViewerApplication = {
      await this._parseHashParams();
    }

-    if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) {
-      let mode;
-      switch (AppOptions.get("viewerCssTheme")) {
-        case 1:
-          mode = "is-light";
-          break;
-        case 2:
-          mode = "is-dark";
-          break;
+    let mode;
+    switch (AppOptions.get("viewerCssTheme")) {
+      case 1:
+        mode = "is-light";
+        break;
+      case 2:
+        mode = "is-dark";
+        break;
+    }
+    if (mode) {
+      document.documentElement.classList.add(mode);
+    }
+
+    if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) {
+      if (AppOptions.get("enableFakeMLManager")) {
+        this.mlManager =
+          MLManager.getFakeMLManager?.({
+            enableGuessAltText: AppOptions.get("enableGuessAltText"),
+            enableAltTextModelDownload: AppOptions.get(
+              "enableAltTextModelDownload"
+            ),
+          }) || null;
      }
-      if (mode) {
-        document.documentElement.classList.add(mode);
+    } else if (PDFJSDev.test("MOZCENTRAL")) {
+      if (AppOptions.get("enableAltText")) {
+        // We want to load the image-to-text AI engine as soon as possible.
+        this.mlManager = new MLManager({
+          enableGuessAltText: AppOptions.get("enableGuessAltText"),
+          enableAltTextModelDownload: AppOptions.get(
+            "enableAltTextModelDownload"
+          ),
+          altTextLearnMoreUrl: AppOptions.get("altTextLearnMoreUrl"),
+        });
      }
-      if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) {
-        if (AppOptions.get("enableFakeMLManager")) {
-          this.mlManager =
-            MLManager.getFakeMLManager?.({
-              enableGuessAltText: AppOptions.get("enableGuessAltText"),
-              enableAltTextModelDownload: AppOptions.get(
-                "enableAltTextModelDownload"
-              ),
-            }) || null;
-        }
-      }
-    } else if (AppOptions.get("enableAltText")) {
-      // We want to load the image-to-text AI engine as soon as possible.
-      this.mlManager = new MLManager({
-        enableGuessAltText: AppOptions.get("enableGuessAltText"),
-        enableAltTextModelDownload: AppOptions.get(
-          "enableAltTextModelDownload"
-        ),
-        altTextLearnMoreUrl: AppOptions.get("altTextLearnMoreUrl"),
-      });
    }

    // Ensure that the `L10n`-instance has been initialized before creating
--- a/web/app_options.js
+++ b/web/app_options.js
@ -334,6 +334,11 @@ const defaultOptions = {
    value: 1,
    kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
  },
+  viewerCssTheme: {
+    /** @type {number} */
+    value: typeof PDFJSDev !== "undefined" && PDFJSDev.test("CHROME") ? 2 : 0,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
+  },
  viewOnLoad: {
    /** @type {boolean} */
    value: 0,
@ -489,11 +494,6 @@ if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) {
        : "../build/pdf.sandbox.mjs",
    kind: OptionKind.VIEWER,
  };
-  defaultOptions.viewerCssTheme = {
-    /** @type {number} */
-    value: typeof PDFJSDev !== "undefined" && PDFJSDev.test("CHROME") ? 2 : 0,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
-  };
  defaultOptions.enableFakeMLManager = {
    /** @type {boolean} */
    value: true,
Author	SHA1	Message	Date
calixteman	5f4d923618	Merge pull request #19584 from calixteman/update_openjpeg1 Fix the build of the openjpeg decoder in order to use an optimized build of the openjpeg library (bug 1951128)	2025-02-28 22:55:46 +01:00
calixteman	84a5e90a43	Merge pull request #19544 from hecerinc/hecerinc/viewerCssFF Reenable viewerCssTheme option for Firefox	2025-02-28 21:27:20 +01:00
Calixte Denizet	c565810a3d	Fix the build of the openjpeg decoder in order to use an optimized build of the openjpeg library (bug 1951128)	2025-02-28 21:25:51 +01:00
Hector Rincon	4069c3a422	Reenable viewerCssTheme option for Firefox The `viewerCssTheme` was removed in #17222 and subsequently reenabled in #17293, but only for Chromium and generic builds. This commit reenables the function using the new method introduced in #17293.	2025-02-25 22:00:32 -08:00