Fix up annotations

Author: Aditi-1400

src/display/annotation_layer.js

@@ -1267,6 +1267,9 @@ class TextAnnotationElement extends AnnotationElement {
       "data-l10n-args",
       JSON.stringify({ type: this.data.name })
     );
+    if (this.data.name !== "NoIcon" || this.data.hasOwnCanvas) {
+      this.hasOwnCommentButton = true;
+    }
 
     if (!this.data.popupRef && this.hasPopupData) {
       this.hasOwnCommentButton = true;

src/display/api.js

@@ -1912,6 +1912,16 @@ class PDFPageProxy {
     this._intentStates.clear();
     this.objs.clear();
     this.#pendingCleanup = false;
+
+    if (this._transport.rendererHandler) {
+      try {
+        this._transport.rendererHandler.send("cleanupPage", {
+          pageIndex: this._pageIndex,
+        });
+      } catch {
+        // Ignore errors if the renderer worker has been destroyed.
+      }
+    }
     return true;
   }
 
@@ -3442,25 +3452,43 @@ class InternalRenderTask {
           },
           configurable: true,
         });
-        this.rendererHandler.send(
-          "init",
-          {
-            pageIndex: this._pageIndex,
-            canvas: offscreen,
-            map: this.annotationCanvasMap,
-            colors: this.pageColors,
-            taskID: this.taskID,
-            transform,
-            viewport,
-            transparency,
-            background,
-            renderingIntent,
-            optionalContentConfig: optionalContentConfigData,
-            optionalContentConfigState,
-            dependencyTracker,
-          },
-          [offscreen]
-        );
+        const initTransfers = [offscreen];
+        const initParams = {
+          pageIndex: this._pageIndex,
+          canvas: offscreen,
+          colors: this.pageColors,
+          taskID: this.taskID,
+          transform,
+          viewport,
+          transparency,
+          background,
+          renderingIntent,
+          optionalContentConfig: optionalContentConfigData,
+          optionalContentConfigState,
+          dependencyTracker,
+        };
+
+        if (this.annotationCanvasMap) {
+          const annotationCanvases = [];
+          for (const [id, canvas] of this.annotationCanvasMap) {
+            try {
+              const annotationCanvas = canvas.transferControlToOffscreen();
+              annotationCanvases.push([id, annotationCanvas]);
+              initTransfers.push(annotationCanvas);
+            } catch (ex) {
+              warn(
+                `Failed to transfer annotation canvas to worker: ${ex.message}. `
+              );
+            }
+          }
+          if (annotationCanvases.length > 0) {
+            initParams.annotationCanvases = annotationCanvases;
+          } else {
+            initParams.map = new Map();
+          }
+        }
+
+        this.rendererHandler.send("init", initParams, initTransfers);
       } catch (ex) {
         // If transferControlToOffscreen fails (e.g., canvas already
         // has a context), fall back to main thread rendering

src/display/renderer_worker.js

@@ -69,7 +69,7 @@ class RendererMessageHandler {
       ({
         pageIndex,
         canvas,
-        map,
+        annotationCanvasMap,
         colors,
         taskID,
         transform,
@@ -102,7 +102,7 @@ class RendererMessageHandler {
           this.#canvasFactory,
           this.#filterFactory,
           { optionalContentConfig },
-          map,
+          annotationCanvasMap,
           colors
         );
         gfx.beginDrawing({ transform, viewport, transparency, background });