From bcc95460b6353f15a64091a04ad669428ff267db Mon Sep 17 00:00:00 2001
From: Calixte Denizet <calixte.denizet@gmail.com>
Date: Fri, 9 Feb 2024 18:19:19 +0100
Subject: [PATCH] Revert "Remove the `enableStampEditor` preference" (bug
 1879588)

This reverts commit e820688510e2c1c24088e76a178a82ef8ebcaf4d.
---
 extensions/chromium/preferences_schema.json | 4 ++++
 web/app.js                                  | 4 ++--
 web/app_options.js                          | 8 ++++++++
 web/viewer.html                             | 2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/extensions/chromium/preferences_schema.json b/extensions/chromium/preferences_schema.json
index 03ea76a53..c8500a0e1 100644
--- a/extensions/chromium/preferences_schema.json
+++ b/extensions/chromium/preferences_schema.json
@@ -72,6 +72,10 @@
       "type": "string",
       "default": "yellow=#FFFF98,green=#53FFBC,blue=#80EBFF,pink=#FFCBE6,red=#FF4F5F"
     },
+    "enableStampEditor": {
+      "type": "boolean",
+      "default": true
+    },
     "disableRange": {
       "title": "Disable range requests",
       "description": "Whether to disable range requests (not recommended).",
diff --git a/web/app.js b/web/app.js
index f1736f04b..e981360d0 100644
--- a/web/app.js
+++ b/web/app.js
@@ -453,8 +453,8 @@ const PDFViewerApplication = {
 
     if (appConfig.annotationEditorParams) {
       if (annotationEditorMode !== AnnotationEditorType.DISABLE) {
-        if (!isOffscreenCanvasSupported) {
-          appConfig.toolbar?.editorStampButton?.classList.add("hidden");
+        if (AppOptions.get("enableStampEditor") && isOffscreenCanvasSupported) {
+          appConfig.toolbar?.editorStampButton?.classList.remove("hidden");
         }
 
         const editorHighlightButton = appConfig.toolbar?.editorHighlightButton;
diff --git a/web/app_options.js b/web/app_options.js
index 7a16d8d66..998a6ed2c 100644
--- a/web/app_options.js
+++ b/web/app_options.js
@@ -158,6 +158,14 @@ const defaultOptions = {
     value: typeof PDFJSDev === "undefined" || !PDFJSDev.test("CHROME"),
     kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
   },
+  enableStampEditor: {
+    // We'll probably want to make some experiments before enabling this
+    // in Firefox release, but it has to be temporary.
+    // TODO: remove it when unnecessary.
+    /** @type {boolean} */
+    value: true,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
+  },
   externalLinkRel: {
     /** @type {string} */
     value: "noopener noreferrer nofollow",
diff --git a/web/viewer.html b/web/viewer.html
index d65e56e63..278322e83 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -360,7 +360,7 @@ See https://github.com/adobe-type-tools/cmap-resources
                   <button id="editorInk" class="toolbarButton" disabled="disabled" title="Draw" role="radio" aria-checked="false" aria-controls="editorInkParamsToolbar" tabindex="33" data-l10n-id="pdfjs-editor-ink-button">
                     <span data-l10n-id="pdfjs-editor-ink-button-label">Draw</span>
                   </button>
-                  <button id="editorStamp" class="toolbarButton" disabled="disabled" title="Add or edit images" role="radio" aria-checked="false" aria-controls="editorStampParamsToolbar" tabindex="34" data-l10n-id="pdfjs-editor-stamp-button">
+                  <button id="editorStamp" class="toolbarButton hidden" disabled="disabled" title="Add or edit images" role="radio" aria-checked="false" aria-controls="editorStampParamsToolbar" tabindex="34" data-l10n-id="pdfjs-editor-stamp-button">
                     <span data-l10n-id="pdfjs-editor-stamp-button-label">Add or edit images</span>
                   </button>
                 </div>