Conflicts

Author: atishdhu

src/display/canvas.js

@@ -1059,10 +1059,6 @@ class CanvasGraphics {
     // Vertical or horizontal scaling shall not be more than 2 to not lose the
     // pixels during drawImage operation, painting on the temporary canvas(es)
     // that are twice smaller in size.
-
-    // displayWidth and displayHeight are used for VideoFrame.
-    const width = img.width ?? img.displayWidth;
-    const height = img.height ?? img.displayHeight;
     let widthScale = Math.max(
       Math.hypot(inverseTransform[0], inverseTransform[1]),
       1
@@ -1498,7 +1494,6 @@ class CanvasGraphics {
     let maskY = layerOffsetY - maskOffsetY;
 
     if (backdrop) {
-      const backdropRGB = Util.makeHexColor(...backdrop);
       if (
         maskX < 0 ||
         maskY < 0 ||
@@ -1512,22 +1507,23 @@ class CanvasGraphics {
         );
         const ctx = canvas.context;
         ctx.drawImage(maskCanvas, -maskX, -maskY);
-        ctx.globalCompositeOperation = "destination-atop";
-        ctx.fillStyle = backdropRGB;
-        ctx.fillRect(0, 0, width, height);
-        ctx.globalCompositeOperation = "source-over";
-
+        if (backdrop.some(c => c !== 0)) {
+          ctx.globalCompositeOperation = "destination-atop";
+          ctx.fillStyle = Util.makeHexColor(...backdrop);
+          ctx.fillRect(0, 0, width, height);
+          ctx.globalCompositeOperation = "source-over";
+        }
         maskCanvas = canvas.canvas;
         maskX = maskY = 0;
-      } else {
+      } else if (backdrop.some(c => c !== 0)) {
         maskCtx.save();
         maskCtx.globalAlpha = 1;
         maskCtx.setTransform(1, 0, 0, 1, 0, 0);
         const clip = new Path2D();
         clip.rect(maskX, maskY, width, height);
         maskCtx.clip(clip);
         maskCtx.globalCompositeOperation = "destination-atop";
-        maskCtx.fillStyle = backdropRGB;
+        maskCtx.fillStyle = Util.makeHexColor(...backdrop);
         maskCtx.fillRect(maskX, maskY, width, height);
         maskCtx.restore();
       }

test/test_manifest.json

@@ -10734,12 +10734,5 @@
     "type": "eq",
     "link": true,
     "talos": false
-  },
-  {
-    "id": "issue18956",
-    "file": "pdfs/issue18956.pdf",
-    "md5": "73e8cd32bd063e42fcc4b270c78549b1",
-    "rounds": 1,
-    "type": "eq"
   }
 ]