Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13725 from Snuffleupagus/catch-setTransform

Browse Source 
Avoid all rendering breaking completely when `CanvasPattern.setTransform()` is unsupported
This commit is contained in:
Brendan Dahl 2021-07-14 10:16:56 -07:00 committed by GitHub
commit 15ab7a822f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/display/pattern_helper.js
View File

@ -19,22 +19,8 @@ import {
shadow,
unreachable,
Util,
warn,
} from "../shared/util.js";
import { DOMSVGFactory } from "./display_utils.js";
let svgElement;
// TODO: remove this when Firefox ESR supports DOMMatrix.
function createMatrix(matrix) {
if (typeof DOMMatrix !== "undefined") {
return new DOMMatrix(matrix);
}
if (!svgElement) {
const svgFactory = new DOMSVGFactory();
svgElement = svgFactory.createElement("svg");
}
return svgElement.createSVGMatrix(matrix);
}
function applyBoundingBox(ctx, bbox) {
if (!bbox || typeof Path2D === "undefined") {
@ -120,8 +106,16 @@ class RadialAxialShadingPattern extends BaseShadingPattern {
tmpCtx.fillStyle = grad;
tmpCtx.fill();
const domMatrix = new DOMMatrix(inverse);
const pattern = ctx.createPattern(tmpCanvas.canvas, "repeat");
pattern.setTransform(createMatrix(inverse));
try {
pattern.setTransform(domMatrix);
} catch (ex) {
// Avoid rendering breaking completely in Firefox 78 ESR,
// and in Node.js (see issue 13724).
warn(`RadialAxialShadingPattern.getPattern: "${ex?.message}".`);
}
return pattern;
}
}
@ -627,7 +621,7 @@ class TilingPattern {
const temporaryPatternCanvas = this.createPatternCanvas(owner);
let domMatrix = createMatrix(matrix);
let domMatrix = new DOMMatrix(matrix);
// Rescale and so that the ctx.createPattern call generates a pattern with
// the desired size.
domMatrix = domMatrix.translate(
@ -640,10 +634,15 @@ class TilingPattern {
);
const pattern = ctx.createPattern(temporaryPatternCanvas.canvas, "repeat");
pattern.setTransform(domMatrix);
try {
pattern.setTransform(domMatrix);
} catch (ex) {
// Avoid rendering breaking completely in Firefox 78 ESR,
// and in Node.js (see issue 13724).
warn(`TilingPattern.getPattern: "${ex?.message}".`);
}
return pattern;
}
}
export { createMatrix, getShadingPattern, TilingPattern };
export { getShadingPattern, TilingPattern };