fixup! Implement offscreen rendering with workers

Author: ryzokuken

src/display/api.js

@@ -1952,9 +1952,9 @@ class PDFPageProxy {
     return this._stats;
   }
 
-  resetCanvas() {
+  resetCanvas(taskID) {
     this._transport.rendererHandler.send("resetCanvas", {
-      pageIndex: this._pageIndex,
+      taskID,
     });
   }
 }
@@ -3073,6 +3073,10 @@ class RenderTask {
       (separateAnnots.canvas && annotationCanvasMap?.size > 0)
     );
   }
+
+  get taskID() {
+    return this.#internalRenderTask.taskID;
+  }
 }
 
 /**
@@ -3163,17 +3167,16 @@ class InternalRenderTask {
     this.rendererHandler.send(
       "init",
       {
-        canvas: offscreen,
-        drawingParams: {
-          viewport,
-          transform,
-          transparency,
-          background,
-        },
         pageIndex: this._pageIndex,
+        canvas: offscreen,
         map: this.annotationCanvasMap,
         colors: this.pageColors,
         taskID: this.taskID,
+        transform,
+        viewport,
+        transparency,
+        background,
+        optionalContentConfig,
       },
       [offscreen]
     );

src/display/canvas.js

@@ -648,7 +648,7 @@ class CanvasGraphics {
     objs,
     canvasFactory,
     filterFactory,
-    { isVisible, markedContentStack = null },
+    { optionalContentConfig, markedContentStack = null },
     annotationCanvasMap,
     pageColors
   ) {
@@ -678,8 +678,7 @@ class CanvasGraphics {
     this.suspendedCtx = null;
     this.contentVisible = true;
     this.markedContentStack = markedContentStack || [];
-    // this.optionalContentConfig = optionalContentConfig;
-    this.isVisible = isVisible;
+    this.optionalContentConfig = optionalContentConfig;
     this.cachedCanvases = new CachedCanvases(this.canvasFactory);
     this.cachedPatterns = new Map();
     this.annotationCanvasMap = annotationCanvasMap;
@@ -2166,8 +2165,7 @@ class CanvasGraphics {
             this.canvasFactory,
             this.filterFactory,
             {
-              // optionalContentConfig: this.optionalContentConfig,
-              isVisible: this.isVisible,
+              optionalContentConfig: this.optionalContentConfig,
               markedContentStack: this.markedContentStack,
             }
           ),
@@ -2876,7 +2874,7 @@ class CanvasGraphics {
   beginMarkedContentProps(tag, properties) {
     if (tag === "OC") {
       this.markedContentStack.push({
-        visible: this.isVisible(properties),
+        visible: this.optionalContentConfig.isVisible(properties),
       });
     } else {
       this.markedContentStack.push({

src/display/renderer_worker.js

@@ -13,8 +13,6 @@ class RendererMessageHandler {
 
   static #tasks = new Map();
 
-  static #canvases = new Map();
-
   static #fontLoader = new FontLoader({
     ownerDocument: self,
   });
@@ -62,7 +60,7 @@ class RendererMessageHandler {
         if (terminated) {
           throw new Error("Renderer worker has been terminated.");
         }
-        this.handleCommonObj(id, type, data, workerHandler, this.#commonObjs);
+        this.handleCommonObj(id, type, data, workerHandler);
       });
 
       workerHandler.on("obj", ([id, pageIndex, type, data]) => {
@@ -75,7 +73,18 @@ class RendererMessageHandler {
 
     mainHandler.on(
       "init",
-      ({ pageIndex, canvas, drawingParams, map, colors, taskID }) => {
+      ({
+        pageIndex,
+        canvas,
+        map,
+        colors,
+        taskID,
+        transform,
+        viewport,
+        transparency,
+        background,
+        optionalContentConfig,
+      }) => {
         assert(!this.#tasks.has(taskID), "Task already initialized");
         const ctx = canvas.getContext("2d", {
           alpha: false,
@@ -88,13 +97,12 @@ class RendererMessageHandler {
           objs,
           this.#canvasFactory,
           this.#filterFactory,
-          {},
+          { optionalContentConfig },
           map,
           colors
         );
-        gfx.beginDrawing(drawingParams);
+        gfx.beginDrawing({ transform, viewport, transparency, background });
         this.#tasks.set(taskID, { canvas, gfx });
-        this.#canvases.set(pageIndex, canvas);
       }
     );
 
@@ -123,12 +131,13 @@ class RendererMessageHandler {
       task.gfx.endDrawing();
     });
 
-    mainHandler.on("resetCanvas", ({ pageIndex }) => {
+    mainHandler.on("resetCanvas", ({ taskID }) => {
       if (terminated) {
         throw new Error("Renderer worker has been terminated.");
       }
-      const canvas = this.#canvases.get(pageIndex);
-      assert(canvas !== undefined, "Page not initialized");
+      const task = this.#tasks.get(taskID);
+      assert(task !== undefined, "Task not initialized");
+      const canvas = task.canvas;
       canvas.width = canvas.height = 0;
     });
 
@@ -141,7 +150,6 @@ class RendererMessageHandler {
       this.#objsMap.clear();
       this.#tasks.clear();
       this.#fontLoader.clear();
-      this.#canvases.clear();
       mainHandler.destroy();
       mainHandler = null;
     });

web/base_pdf_page_view.js

@@ -46,6 +46,8 @@ class BasePDFPageView {
 
   renderTask = null;
 
+  renderTaskID = null;
+
   resume = null;
 
   constructor(options) {
@@ -157,7 +159,7 @@ class BasePDFPageView {
 
       if (prevCanvas) {
         prevCanvas.replaceWith(canvas);
-        this.pdfPage.resetCanvas();
+        this.pdfPage.resetCanvas(this.renderTaskID);
       } else {
         onShow(canvas);
       }
@@ -185,7 +187,7 @@ class BasePDFPageView {
       return;
     }
     canvas.remove();
-    this.pdfPage.resetCanvas();
+    this.pdfPage.resetCanvas(this.renderTaskID);
     this.canvas = null;
     this.#resetTempCanvas();
   }
@@ -207,6 +209,8 @@ class BasePDFPageView {
       }
     };
 
+    this.renderTaskID = renderTask.taskID;
+
     let error = null;
     try {
       await renderTask.promise;

web/pdf_thumbnail_view.js

@@ -303,7 +303,7 @@ class PDFThumbnailView {
       await renderTask.promise;
     } catch (e) {
       if (e instanceof RenderingCancelledException) {
-        zeroCanvas(canvas);
+        pdfPage.resetCanvas(renderTask.taskID);
         return;
       }
       error = e;
@@ -318,7 +318,7 @@ class PDFThumbnailView {
     this.renderingState = RenderingStates.FINISHED;
 
     this.#convertCanvasToImage(canvas);
-    zeroCanvas(canvas);
+    pdfPage.resetCanvas(renderTask.taskID);
 
     this.eventBus.dispatch("thumbnailrendered", {
       source: this,