mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

Apply HCM filters on annotations which have their own canvas (bug 1830850)

Browse source
This commit is contained in:
Calixte Denizet 2023-05-02 16:37:49 +02:00
parent 797f8d3dca
commit c07149a44f
3 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/display/api.js
View file

@ -3326,7 +3326,8 @@ class InternalRenderTask {
this.canvasFactory,
this.filterFactory,
{ optionalContentConfig },
this.annotationCanvasMap
this.annotationCanvasMap,
this.pageColors
);
this.gfx.beginDrawing({
transform,
@ -3342,7 +3343,7 @@ class InternalRenderTask {
cancel(error = null, extraDelay = 0) {
this.running = false;
this.cancelled = true;
this.gfx?.endDrawing(this.pageColors);
this.gfx?.endDrawing();
if (this._canvas) {
InternalRenderTask.#canvasInUse.delete(this._canvas);

19
src/display/canvas.js
View file

@ -947,7 +947,8 @@ class CanvasGraphics {
canvasFactory,
filterFactory,
{ optionalContentConfig, markedContentStack = null },
annotationCanvasMap
annotationCanvasMap,
pageColors
) {
this.ctx = canvasCtx;
this.current = new CanvasExtraState(
@ -983,6 +984,7 @@ class CanvasGraphics {
this.viewportScale = 1;
this.outputScaleX = 1;
this.outputScaleY = 1;
this.pageColors = pageColors;
this._cachedScaleForStroking = null;
this._cachedGetSinglePixelWidth = null;
@ -1135,7 +1137,7 @@ class CanvasGraphics {
}
}
endDrawing(pageColors = null) {
endDrawing() {
this.#restoreInitialState();
this.cachedCanvases.clear();
@ -1153,11 +1155,14 @@ class CanvasGraphics {
cache.clear();
}
this._cachedBitmapsMap.clear();
this.#drawFilter();
}
if (pageColors) {
#drawFilter() {
if (this.pageColors) {
const hcmFilterId = this.filterFactory.addHCMFilter(
pageColors.foreground,
pageColors.background
this.pageColors.foreground,
this.pageColors.background
);
if (hcmFilterId !== "none") {
const savedFilter = this.ctx.filter;
@ -2712,6 +2717,7 @@ class CanvasGraphics {
this.annotationCanvasMap.set(id, canvas);
this.annotationCanvas.savedCtx = this.ctx;
this.ctx = context;
this.ctx.save();
this.ctx.setTransform(scaleX, 0, 0, -scaleY, 0, height * scaleY);
resetCtxToDefault(this.ctx);
@ -2735,6 +2741,9 @@ class CanvasGraphics {
endAnnotation() {
if (this.annotationCanvas) {
this.ctx.restore();
this.#drawFilter();
this.ctx = this.annotationCanvas.savedCtx;
delete this.annotationCanvas.savedCtx;
delete this.annotationCanvas;