Merge pull request mozilla#18990 from Snuffleupagus/ensure-structTree…

…-serializable Ensure that serializing of StructTree-data cannot fail during loading
timvandermeij · Nov 2, 2024 · e548510 · e548510
2 parents aa4839e + b26dc19
commit e548510
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/core/document.js b/src/core/document.js
@@ -707,7 +707,7 @@ class Page {
     const structTree = await this.pdfManager.ensure(this, "_parseStructTree", [
       structTreeRoot,
     ]);
-    return structTree.serializable;
+    return this.pdfManager.ensure(structTree, "serializable");
   }
 
   /**

diff --git a/web/struct_tree_layer_builder.js b/web/struct_tree_layer_builder.js
@@ -112,8 +112,14 @@ class StructTreeLayerBuilder {
   }
 
   async getAriaAttributes(annotationId) {
-    await this.render();
-    return this.#elementAttributes.get(annotationId);
+    try {
+      await this.render();
+      return this.#elementAttributes.get(annotationId);
+    } catch {
+      // If the structTree cannot be fetched, parsed, and/or rendered,
+      // ensure that e.g. the AnnotationLayer won't break completely.
+    }
+    return null;
   }
 
   hide() {