Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-06-12 21:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent intermittent issues when invoking the PDFPageView.prototype.#injectLinkAnnotations method

Browse Source 
Looking at the coverage data there are cases where we attempt to insert inferred link-annotations *before* the annotationLayer has rendered, see [here](2348365874/blob/web/annotation_layer_builder.js (L246)), which shouldn't happen and why that's treated as an Error.

This is most likely caused by the asynchronicity of all the relevant code, since the `Autolinker` functionality can only be invoked after both the annotationLayer *and* the textLayer have finished rendering.
Given that those operations are asynchronous, by the time that they complete it's possible that the annotationLayer (and also the textLayer) has been replaced by a new instance. In that case we might thus attempt to inject inferred link-annotations before the "new" annotationLayer has rendered.

To avoid this intermittent issue, we now ensure that the annotationLayer and textLayer haven't changed between those layers rendering and the `Autolinker` functionality being invoked. (If they did change, then a future `render` call will trigger the inferred link-annotations handling).
This commit is contained in:
Jonas Jenwald 2026-06-07 11:28:57 +02:00
parent f12c463452
commit 43dd2781a0
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
web/pdf_page_view.js
View File

@ -461,7 +461,9 @@ class PDFPageView extends BasePDFPageView {
});
}
async #renderAnnotationLayer() {
async #renderAnnotationLayer(textLayerPromise = null) {
const { annotationLayer, textLayer } = this;
let error = null;
try {
await this.annotationLayer.render({
@ -476,6 +478,10 @@ class PDFPageView extends BasePDFPageView {
} finally {
this.#dispatchLayerRendered("annotationlayerrendered", error);
}
if (this.#enableAutoLinking && textLayerPromise) {
this.#injectLinkAnnotations(textLayerPromise, annotationLayer, textLayer);
}
}
async #renderAnnotationEditorLayer() {
@ -532,9 +538,6 @@ class PDFPageView extends BasePDFPageView {
}
async #renderTextLayer() {
if (!this.textLayer) {
return;
}
let error = null;
try {
await this.textLayer.render({
@ -568,10 +571,6 @@ class PDFPageView extends BasePDFPageView {
* aria-owns to work.
*/
async #renderStructTreeLayer() {
if (!this.textLayer) {
return;
}
const treeDom = await this.structTreeLayer?.render();
if (treeDom) {
this.l10n.pause();
@ -595,24 +594,25 @@ class PDFPageView extends BasePDFPageView {
this._textHighlighter.enable();
}
async #injectLinkAnnotations(textLayerPromise) {
async #injectLinkAnnotations(textLayerPromise, annotationLayer, textLayer) {
let error = null;
try {
await textLayerPromise;
if (!this.annotationLayer) {
if (
annotationLayer !== this.annotationLayer ||
textLayer !== this.textLayer
) {
return; // Rendering was cancelled while the textLayerPromise resolved.
}
await this.annotationLayer.injectLinkAnnotations(
await annotationLayer.injectLinkAnnotations(
Autolinker.processLinks(this)
);
} catch (ex) {
console.error("#injectLinkAnnotations:", ex);
error = ex;
}
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) {
this.#dispatchLayerRendered("linkannotationsadded", error);
}
this.#dispatchLayerRendered("linkannotationsadded", error);
}
_resetCanvas() {
@ -1192,14 +1192,10 @@ class PDFPageView extends BasePDFPageView {
viewport.rawDims
);
const textLayerPromise = this.#renderTextLayer();
const textLayerPromise = this.textLayer ? this.#renderTextLayer() : null;
if (this.annotationLayer) {
await this.#renderAnnotationLayer();
if (this.#enableAutoLinking && this.annotationLayer && this.textLayer) {
await this.#injectLinkAnnotations(textLayerPromise);
}
await this.#renderAnnotationLayer(textLayerPromise);
}
this.drawLayer ||= new DrawLayerBuilder({
@ -1216,7 +1212,6 @@ class PDFPageView extends BasePDFPageView {
if (!annotationEditorUIManager) {
return;
}
if (
this.annotationLayer ||
this.#annotationMode === AnnotationMode.DISABLE