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

Merge pull request #12369 from emilio/better-cancelation-follow-up

Browse Source 
canvas: fix restore() with existing SMask groups and re-land #12363.
This commit is contained in:
Tim van der Meij 2020-09-15 23:19:17 +02:00 committed by GitHub
commit 558d3870d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/display/canvas.js
View File

@ -1009,8 +1009,8 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
endDrawing: function CanvasGraphics_endDrawing() { endDrawing: function CanvasGraphics_endDrawing() {
// Finishing all opened operations such as SMask group painting. // Finishing all opened operations such as SMask group painting.
if (this.current.activeSMask !== null) { while (this.stateStack.length || this.current.activeSMask !== null) {
this.endSMaskGroup(); this.restore();
} }
this.ctx.restore(); this.ctx.restore();
@ -1192,7 +1192,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
groupCtx.clearRect(0, 0, groupCtx.canvas.width, groupCtx.canvas.height); groupCtx.clearRect(0, 0, groupCtx.canvas.width, groupCtx.canvas.height);
groupCtx.restore(); groupCtx.restore();
}, },
resumeSMaskGroup: function CanvasGraphics_endSMaskGroup() { resumeSMaskGroup: function CanvasGraphics_resumeSMaskGroup() {
// Resuming state saved by suspendSMaskGroup. We don't need to restore // Resuming state saved by suspendSMaskGroup. We don't need to restore
// any groupCtx state since restore() command (the only caller) will do // any groupCtx state since restore() command (the only caller) will do
// that for us. See also beginSMaskGroup. // that for us. See also beginSMaskGroup.
@ -1254,6 +1254,9 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
this.pendingClip = null; this.pendingClip = null;
this._cachedGetSinglePixelWidth = null; this._cachedGetSinglePixelWidth = null;
} else {
// We've finished all the SMask groups, reflect that in our state.
this.current.activeSMask = null;
} }
}, },
transform: function CanvasGraphics_transform(a, b, c, d, e, f) { transform: function CanvasGraphics_transform(a, b, c, d, e, f) {