From cd72818438c8ee22ff1f08b2cb19f3e46dcbb53f Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Sat, 3 Dec 2022 22:58:37 +0100
Subject: [PATCH] Remove unused `StructTreeLayerBuilder` constructor parameter

Also change the "private" methods into properly private ones.
---
 web/default_factory.js           | 12 ++----------
 web/interfaces.js                |  8 +-------
 web/pdf_page_view.js             |  2 +-
 web/pdf_viewer.js                | 12 ++----------
 web/struct_tree_layer_builder.js | 26 ++++++--------------------
 5 files changed, 12 insertions(+), 48 deletions(-)

diff --git a/web/default_factory.js b/web/default_factory.js
index 184dfe073..0688eee58 100644
--- a/web/default_factory.js
+++ b/web/default_factory.js
@@ -144,18 +144,10 @@ class DefaultAnnotationEditorLayerFactory {
  */
 class DefaultStructTreeLayerFactory {
   /**
-   * @typedef {Object} CreateStructTreeLayerBuilderParameters
-   * @property {PDFPageProxy} pdfPage
-   */
-
-  /**
-   * @param {CreateStructTreeLayerBuilderParameters}
    * @returns {StructTreeLayerBuilder}
    */
-  createStructTreeLayerBuilder({ pdfPage }) {
-    return new StructTreeLayerBuilder({
-      pdfPage,
-    });
+  createStructTreeLayerBuilder() {
+    return new StructTreeLayerBuilder();
   }
 }
 
diff --git a/web/interfaces.js b/web/interfaces.js
index e8b5b1397..e558cb39b 100644
--- a/web/interfaces.js
+++ b/web/interfaces.js
@@ -280,15 +280,9 @@ class IPDFXfaLayerFactory {
  */
 class IPDFStructTreeLayerFactory {
   /**
-   * @typedef {Object} CreateStructTreeLayerBuilderParameters
-   * @property {PDFPageProxy} pdfPage
-   */
-
-  /**
-   * @param {CreateStructTreeLayerBuilderParameters}
    * @returns {StructTreeLayerBuilder}
    */
-  createStructTreeLayerBuilder({ pdfPage }) {}
+  createStructTreeLayerBuilder() {}
 }
 
 /**
diff --git a/web/pdf_page_view.js b/web/pdf_page_view.js
index 3f98b2ea0..80a217434 100644
--- a/web/pdf_page_view.js
+++ b/web/pdf_page_view.js
@@ -873,7 +873,7 @@ class PDFPageView {
       };
       this.eventBus._on("textlayerrendered", this._onTextLayerRendered);
       this.structTreeLayer =
-        this.structTreeLayerFactory.createStructTreeLayerBuilder({ pdfPage });
+        this.structTreeLayerFactory.createStructTreeLayerBuilder();
     }
 
     div.setAttribute("data-loaded", true);
diff --git a/web/pdf_viewer.js b/web/pdf_viewer.js
index d0b299976..d6ab1ae3f 100644
--- a/web/pdf_viewer.js
+++ b/web/pdf_viewer.js
@@ -1794,18 +1794,10 @@ class PDFViewer {
   }
 
   /**
-   * @typedef {Object} CreateStructTreeLayerBuilderParameters
-   * @property {PDFPageProxy} pdfPage
-   */
-
-  /**
-   * @param {CreateStructTreeLayerBuilderParameters}
    * @returns {StructTreeLayerBuilder}
    */
-  createStructTreeLayerBuilder({ pdfPage }) {
-    return new StructTreeLayerBuilder({
-      pdfPage,
-    });
+  createStructTreeLayerBuilder() {
+    return new StructTreeLayerBuilder();
   }
 
   /**
diff --git a/web/struct_tree_layer_builder.js b/web/struct_tree_layer_builder.js
index 41306d1c7..463756e96 100644
--- a/web/struct_tree_layer_builder.js
+++ b/web/struct_tree_layer_builder.js
@@ -13,8 +13,6 @@
  * limitations under the License.
  */
 
-/** @typedef {import("../src/display/api").PDFPageProxy} PDFPageProxy */
-
 const PDF_ROLE_TO_HTML_ROLE = {
   // Document level structure types
   Document: null, // There's a "document" role, but it doesn't make sense here.
@@ -73,24 +71,12 @@ const PDF_ROLE_TO_HTML_ROLE = {
 
 const HEADING_PATTERN = /^H(\d+)$/;
 
-/**
- * @typedef {Object} StructTreeLayerBuilderOptions
- * @property {PDFPageProxy} pdfPage
- */
-
 class StructTreeLayerBuilder {
-  /**
-   * @param {StructTreeLayerBuilderOptions} options
-   */
-  constructor({ pdfPage }) {
-    this.pdfPage = pdfPage;
-  }
-
   render(structTree) {
-    return this._walk(structTree);
+    return this.#walk(structTree);
   }
 
-  _setAttributes(structElement, htmlElement) {
+  #setAttributes(structElement, htmlElement) {
     if (structElement.alt !== undefined) {
       htmlElement.setAttribute("aria-label", structElement.alt);
     }
@@ -102,7 +88,7 @@ class StructTreeLayerBuilder {
     }
   }
 
-  _walk(node) {
+  #walk(node) {
     if (!node) {
       return null;
     }
@@ -119,16 +105,16 @@ class StructTreeLayerBuilder {
       }
     }
 
-    this._setAttributes(node, element);
+    this.#setAttributes(node, element);
 
     if (node.children) {
       if (node.children.length === 1 && "id" in node.children[0]) {
         // Often there is only one content node so just set the values on the
         // parent node to avoid creating an extra span.
-        this._setAttributes(node.children[0], element);
+        this.#setAttributes(node.children[0], element);
       } else {
         for (const kid of node.children) {
-          element.append(this._walk(kid));
+          element.append(this.#walk(kid));
         }
       }
     }