fixup! fixup! Fix filters, annotation canvases

Author: Aditi-1400

src/display/api.js

@@ -239,7 +239,8 @@ function operatorListHasDOMFilters({ fnArray, argsArray }) {
  *   The default value is `false`.
  * @property {HTMLDocument} [ownerDocument] - Specify an explicit document
  *   context to create elements with and to load resources, such as fonts,
- *   into. Defaults to the current document.
+ *   into. Defaults to the current document. Renderer-worker rendering is
+ *   disabled when this is set to a custom document.
  * @property {boolean} [disableRange] - Disable range request loading of PDF
  *   files. When enabled, and if the server supports partial content requests,
  *   then the PDF will be fetched in chunks. The default value is `false`.
@@ -377,10 +378,22 @@ function getDocument(src = {}) {
   const enableHWA = src.enableHWA === true;
   const useWasm = src.useWasm !== false;
   const pagesMapper = src.pagesMapper || new PagesMapper();
+  const styleElement =
+    typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")
+      ? src.styleElement
+      : null;
+  // Custom DOM contexts are main-thread only and cannot be transferred to
+  // the renderer worker.
+  const hasCustomOwnerDocument =
+    src.ownerDocument !== undefined &&
+    src.ownerDocument !== globalThis.document;
+  const hasCustomStyleElement = !!styleElement;
   const disableWorkerRendering =
     src.disableWorkerRendering === true ||
     typeof Worker === "undefined" ||
-    typeof MessageChannel === "undefined";
+    typeof MessageChannel === "undefined" ||
+    hasCustomOwnerDocument ||
+    hasCustomStyleElement;
 
   // Parameters whose default values depend on other parameters.
   const length = rangeTransport ? rangeTransport.length : (src.length ?? NaN);
@@ -403,13 +416,6 @@ function getDocument(src = {}) {
           isValidFetchUrl(standardFontDataUrl, document.baseURI) &&
           isValidFetchUrl(wasmUrl, document.baseURI)
         );
-
-  // Parameters only intended for development/testing purposes.
-  const styleElement =
-    typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")
-      ? src.styleElement
-      : null;
-
   // Set the main-thread verbosity level.
   setVerbosityLevel(verbosity);
 
@@ -3672,8 +3678,6 @@ class InternalRenderTask {
     const { viewport, transform, background, dependencyTracker } = this.params;
 
     // TODO(Aditi): Should we disable worker rendering when pdfBug is enabled?
-    const hasOperatorListChunk =
-      this.operatorList.argsArray.length > 0 || this.operatorList.lastChunk;
 
     // Worker Rendering is disabled when canvas filters are present because
     // OffscreenCanvas's OffscreenCanvasRenderingContext2D completely ignores
@@ -3684,7 +3688,7 @@ class InternalRenderTask {
       this._rendererHandler &&
       this._canvasContext === null &&
       !hasCanvasFilters &&
-      hasOperatorListChunk;
+      !this.pageColors;
 
     // TODO(Aditi): Should we disable worker rendering when pdfBug is enabled?
     if (!useWorkerRendering) {

src/display/renderer_worker.js

@@ -220,14 +220,21 @@ class RendererMessageHandler {
       });
       const canvasFactory = createCanvasFactory({ enableHWA });
       const filterFactory = new WorkerFilterFactory();
+      let annotationCanvases = null;
+      if (annotationCanvasMap) {
+        annotationCanvases =
+          annotationCanvasMap instanceof Map
+            ? annotationCanvasMap
+            : new Map(annotationCanvasMap);
+      }
       const gfx = new CanvasGraphics(
         ctx,
         this.#commonObjs,
         objs,
         canvasFactory,
         filterFactory,
         { optionalContentConfig },
-        annotationCanvasMap
+        annotationCanvases
         /** Renderer worker doesn't support pageColors and dependencyTracker */
       );
 
@@ -304,7 +311,7 @@ class RendererMessageHandler {
       return currentOperatorListIdx;
     });
 
-    handler.on("resetCanvas", ({ renderTaskId }) => {
+    handler.on("ResetCanvas", ({ renderTaskId }) => {
       const task = this.#renderTaskStates.get(renderTaskId);
       if (!task) {
         return;
@@ -331,6 +338,8 @@ class RendererMessageHandler {
 
     const pdfWorkerHandler = new MessageHandler(sourceName, targetName, port);
     this.#pdfWorkerHandlers.set(bridgeId, pdfWorkerHandler);
+    // TODO(Aditi): To be used when we stop forwarding and start
+    // transferring to worker directly.
     this.#setupObjectHandler(pdfWorkerHandler);
 
     pdfWorkerHandler.send("ready", null);

test/driver.js

@@ -512,8 +512,8 @@ class Driver {
 
     // Create a working canvas
     this.canvas = document.createElement("canvas");
-    // Used as the render-target when testing `renderInWorker`, since a canvas
-    // can only be transferred once using `transferControlToOffscreen`.
+    // Used as the render-target when testing rendering in worker, since a
+    // canvas can only be transferred once using `transferControlToOffscreen`.
     this.renderCanvas = null;
   }