wip extract tracking

Author: nicolo-ribaudo

src/display/api.js

@@ -70,6 +70,7 @@ import {
   NodeFilterFactory,
 } from "display-node_utils";
 import { CanvasGraphics } from "./canvas.js";
+import { CanvasTrackingGraphics } from "./canvas_tracking_graphics.js";
 import { DOMBinaryDataFactory } from "display-binary_data_factory";
 import { DOMCanvasFactory } from "./canvas_factory.js";
 import { DOMFilterFactory } from "./filter_factory.js";
@@ -1502,11 +1503,12 @@ class PDFPageProxy {
       intentState.renderTasks.delete(internalRenderTask);
 
       if (shouldRecordOperations) {
-        const recordedBBoxes = internalRenderTask.gfx?.dependencyTracker.take();
+        const tracker = internalRenderTask._trackingGfx?.dependencyTracker;
+        const recordedBBoxes = tracker?.take();
         if (recordedBBoxes) {
           internalRenderTask.stepper?.setOperatorBBoxes(
             recordedBBoxes,
-            internalRenderTask.gfx.dependencyTracker.takeDebugMetadata()
+            tracker.takeDebugMetadata()
           );
 
           if (recordOperations) {
@@ -1516,7 +1518,7 @@ class PDFPageProxy {
       }
 
       if (shouldRecordImages && !error) {
-        this.imageCoordinates = internalRenderTask.gfx?.imagesTracker.take();
+        this.imageCoordinates = internalRenderTask._imagesTracker?.take();
       }
 
       // Attempt to reduce memory usage during *printing*, by always running
@@ -1568,10 +1570,6 @@ class PDFPageProxy {
       params: {
         canvas,
         canvasContext,
-        dependencyTracker: dependencyTracker ?? bboxTracker,
-        imagesTracker: shouldRecordImages
-          ? new CanvasImagesTracker(canvas)
-          : null,
         viewport,
         transform,
         background,
@@ -1588,6 +1586,10 @@ class PDFPageProxy {
       pageColors,
       enableHWA: this._transport.enableHWA,
       operationsFilter,
+      dependencyTracker: dependencyTracker ?? bboxTracker,
+      imagesTracker: shouldRecordImages
+        ? new CanvasImagesTracker(canvas)
+        : null,
     });
 
     (intentState.renderTasks ||= new Set()).add(internalRenderTask);
@@ -3220,6 +3222,8 @@ class InternalRenderTask {
     pageColors = null,
     enableHWA = false,
     operationsFilter = null,
+    dependencyTracker = null,
+    imagesTracker = null,
   }) {
     this.callback = callback;
     this.params = params;
@@ -3250,8 +3254,8 @@ class InternalRenderTask {
     this._canvas = params.canvas;
     this._canvasContext = params.canvas ? null : params.canvasContext;
     this._enableHWA = enableHWA;
-    this._dependencyTracker = params.dependencyTracker;
-    this._imagesTracker = params.imagesTracker;
+    this._dependencyTracker = dependencyTracker;
+    this._imagesTracker = imagesTracker;
     this._operationsFilter = operationsFilter;
   }
 
@@ -3282,13 +3286,7 @@ class InternalRenderTask {
       this.stepper.init(this.operatorList);
       this.stepper.nextBreakPoint = this.stepper.getNextBreakPoint();
     }
-    const {
-      viewport,
-      transform,
-      background,
-      dependencyTracker,
-      imagesTracker,
-    } = this.params;
+    const { viewport, transform, background } = this.params;
 
     // When printing in Firefox, we get a specific context in mozPrintCallback
     // which cannot be created from the canvas itself.
@@ -3307,16 +3305,28 @@ class InternalRenderTask {
       this.filterFactory,
       { optionalContentConfig },
       this.annotationCanvasMap,
-      this.pageColors,
-      dependencyTracker,
-      imagesTracker
+      this.pageColors
     );
     this.gfx.beginDrawing({
       transform,
       viewport,
       transparency,
       background,
     });
+
+    if (this._dependencyTracker || this._imagesTracker) {
+      this._trackingGfx = new CanvasTrackingGraphics(
+        this.commonObjs,
+        this.objs,
+        canvasContext.canvas.width,
+        canvasContext.canvas.height,
+        this._dependencyTracker,
+        { optionalContentConfig },
+        this._imagesTracker
+      );
+      this._trackingGfx.beginDrawing({ transform, viewport });
+    }
+
     this.operatorListIdx = 0;
     this.graphicsReady = true;
     this.graphicsReadyCallback?.();
@@ -3346,7 +3356,7 @@ class InternalRenderTask {
       this.graphicsReadyCallback ||= this._continueBound;
       return;
     }
-    this.gfx.dependencyTracker?.growOperationsCount(
+    this._dependencyTracker?.growOperationsCount(
       this.operatorList.fnArray.length
     );
     this.stepper?.updateOperatorList(this.operatorList);
@@ -3395,6 +3405,9 @@ class InternalRenderTask {
       this.running = false;
       if (this.operatorList.lastChunk) {
         this.gfx.endDrawing();
+        if (this._trackingGfx) {
+          this._trackingGfx.executeOperatorList(this.operatorList);
+        }
         InternalRenderTask.#canvasInUse.delete(this._canvas);
         this.callback();
       }