Move the /SetOCGState handling into the OptionalContentConfig class…

… (PR 15377 follow-up) This helps ensure that /SetOCGState actions always take the `Usage` dictionary into account as expected.
mozilla · Mar 5, 2024 · 088940c · 088940c
1 parent 935d94c
commit 088940c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 25 deletions.
diff --git a/src/display/optional_content_config.js b/src/display/optional_content_config.js
@@ -239,6 +239,34 @@ class OptionalContentConfig {
     this.#cachedGetHash = null;
   }
 
+  setOCGState({ state, preserveRB }) {
+    let operator;
+
+    for (const elem of state) {
+      switch (elem) {
+        case "ON":
+        case "OFF":
+        case "Toggle":
+          operator = elem;
+          continue;
+      }
+      switch (operator) {
+        case "ON":
+          this.setVisibility(elem, true);
+          break;
+        case "OFF":
+          this.setVisibility(elem, false);
+          break;
+        case "Toggle":
+          const group = this.getGroup(elem);
+          if (group) {
+            this.setVisibility(elem, !group.visible);
+          }
+          break;
+      }
+    }
+  }
+
   get hasInitialVisibility() {
     return this.#initialHash === null || this.getHash() === this.#initialHash;
   }

diff --git a/web/pdf_link_service.js b/web/pdf_link_service.js
@@ -517,31 +517,7 @@ class PDFLinkService {
     if (pdfDocument !== this.pdfDocument) {
       return; // The document was closed while the optional content resolved.
     }
-    let operator;
-
-    for (const elem of action.state) {
-      switch (elem) {
-        case "ON":
-        case "OFF":
-        case "Toggle":
-          operator = elem;
-          continue;
-      }
-      switch (operator) {
-        case "ON":
-          optionalContentConfig.setVisibility(elem, true);
-          break;
-        case "OFF":
-          optionalContentConfig.setVisibility(elem, false);
-          break;
-        case "Toggle":
-          const group = optionalContentConfig.getGroup(elem);
-          if (group) {
-            optionalContentConfig.setVisibility(elem, !group.visible);
-          }
-          break;
-      }
-    }
+    optionalContentConfig.setOCGState(action);
 
     this.pdfViewer.optionalContentConfigPromise = Promise.resolve(
       optionalContentConfig