simplify fetching textContents

mozilla · Dec 16, 2024 · 50ad6b1 · 50ad6b1
1 parent a20d5d9
commit 50ad6b1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/web/autolinker.js b/web/autolinker.js
@@ -68,8 +68,10 @@ class Autolinker {
     return linkAnnotations;
   }
 
-  static processLinks(pdfPageView, textContent) {
-    const [text, diffs] = normalize(textContent.join(""));
+  static processLinks(pdfPageView) {
+    const [text, diffs] = normalize(
+      pdfPageView._textHighlighter.textContentItemsStr.join("")
+    );
     const matches = text.matchAll(Autolinker.#urlRegex);
     const links = [];
     for (const match of matches) {

diff --git a/web/pdf_page_view.js b/web/pdf_page_view.js
@@ -463,24 +463,22 @@ class PDFPageView {
 
   async #renderTextLayer() {
     if (!this.textLayer) {
-      return [];
+      return;
     }
 
     let error = null;
-    let textContent;
     try {
-      textContent = await this.textLayer.render(this.viewport);
+      await this.textLayer.render(this.viewport);
     } catch (ex) {
       if (ex instanceof AbortException) {
-        return [];
+        return;
       }
       console.error("#renderTextLayer:", ex);
       error = ex;
     }
     this.#dispatchLayerRendered("textlayerrendered", error);
 
     this.#renderStructTreeLayer();
-    return textContent;
   }
 
   /**
@@ -1098,10 +1096,9 @@ class PDFPageView {
         const textLayerP = this.#renderTextLayer();
 
         if (this.annotationLayer) {
-          await textLayerP;
           if (this.#enableAutolinking) {
-            const textContent = await textLayerP;
-            this.#linkAnnotations = Autolinker.processLinks(this, textContent);
+            await textLayerP;
+            this.#linkAnnotations = Autolinker.processLinks(this);
           }
           await this.#renderAnnotationLayer();
         }

diff --git a/web/text_layer_builder.js b/web/text_layer_builder.js
@@ -72,7 +72,6 @@ class TextLayerBuilder {
    * Renders the text layer.
    * @param {PageViewport} viewport
    * @param {Object} [textContentParams]
-   * @returns {Array<string>}
    */
   async render(viewport, textContentParams = null) {
     if (this.#renderingDone && this.#textLayer) {
@@ -81,7 +80,7 @@ class TextLayerBuilder {
         onBefore: this.hide.bind(this),
       });
       this.show();
-      return [];
+      return;
     }
 
     this.cancel();
@@ -113,7 +112,6 @@ class TextLayerBuilder {
     this.#onAppend?.(this.div);
     this.highlighter?.enable();
     this.accessibilityManager?.enable();
-    return textContentItemsStr;
   }
 
   hide() {