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

Merge pull request #12908 from calixteman/11918

Browse Source 
Slightly rescale lineWidth to workaround chrome rendering issue
This commit is contained in:
Tim van der Meij 2021-03-31 21:56:31 +02:00 committed by GitHub
commit ca7f546828
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/display/canvas.js
View File

@ -42,6 +42,13 @@ const MAX_SIZE_TO_COMPILE = 1000;
const FULL_CHUNK_HEIGHT = 16; const FULL_CHUNK_HEIGHT = 16;
// Because of https://bugs.chromium.org/p/chromium/issues/detail?id=1170396
// some curves aren't rendered correctly.
// Multiplying lineWidth by this factor should help to have "correct"
// rendering with no artifacts.
// Once the bug is fixed upstream, we can remove this constant and its use.
const LINEWIDTH_SCALE_FACTOR = 1.000001;
function addContextCurrentTransform(ctx) { function addContextCurrentTransform(ctx) {
// If the context doesn't expose a `mozCurrentTransform`, add a JS based one. // If the context doesn't expose a `mozCurrentTransform`, add a JS based one.
if (!ctx.mozCurrentTransform) { if (!ctx.mozCurrentTransform) {
@ -52,10 +59,33 @@ function addContextCurrentTransform(ctx) {
ctx._originalTranslate = ctx.translate; ctx._originalTranslate = ctx.translate;
ctx._originalTransform = ctx.transform; ctx._originalTransform = ctx.transform;
ctx._originalSetTransform = ctx.setTransform; ctx._originalSetTransform = ctx.setTransform;
ctx._originalResetTransform = ctx.resetTransform;
ctx._transformMatrix = ctx._transformMatrix || [1, 0, 0, 1, 0, 0]; ctx._transformMatrix = ctx._transformMatrix || [1, 0, 0, 1, 0, 0];
ctx._transformStack = []; ctx._transformStack = [];
try {
// The call to getOwnPropertyDescriptor throws an exception in Node.js:
// "TypeError: Method lineWidth called on incompatible receiver
// #<CanvasRenderingContext2D>".
const desc = Object.getOwnPropertyDescriptor(
Object.getPrototypeOf(ctx),
"lineWidth"
);
ctx._setLineWidth = desc.set;
ctx._getLineWidth = desc.get;
Object.defineProperty(ctx, "lineWidth", {
set: function setLineWidth(width) {
this._setLineWidth(width * LINEWIDTH_SCALE_FACTOR);
},
get: function getLineWidth() {
return this._getLineWidth();
},
});
} catch (_) {}
Object.defineProperty(ctx, "mozCurrentTransform", { Object.defineProperty(ctx, "mozCurrentTransform", {
get: function getCurrentTransform() { get: function getCurrentTransform() {
return this._transformMatrix; return this._transformMatrix;
@ -144,6 +174,12 @@ function addContextCurrentTransform(ctx) {
ctx._originalSetTransform(a, b, c, d, e, f); ctx._originalSetTransform(a, b, c, d, e, f);
}; };
ctx.resetTransform = function ctxResetTransform() {
this._transformMatrix = [1, 0, 0, 1, 0, 0];
ctx._originalResetTransform();
};
ctx.rotate = function ctxRotate(angle) { ctx.rotate = function ctxRotate(angle) {
const cosValue = Math.cos(angle); const cosValue = Math.cos(angle);
const sinValue = Math.sin(angle); const sinValue = Math.sin(angle);
@ -2690,9 +2726,7 @@ const CanvasGraphics = (function CanvasGraphicsClosure() {
this._combinedScaleFactor * pixelHeight this._combinedScaleFactor * pixelHeight
); );
} else if (absDet > Number.EPSILON) { } else if (absDet > Number.EPSILON) {
// The multiplication by the constant 1.0000001 is here to have this._cachedGetSinglePixelWidth = pixelHeight;
// a number slightly greater than what we "exactly" want.
this._cachedGetSinglePixelWidth = pixelHeight * 1.0000001;
} else { } else {
// Matrix is non-invertible. // Matrix is non-invertible.
this._cachedGetSinglePixelWidth = 1; this._cachedGetSinglePixelWidth = 1;