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

Merge pull request #15869 from Snuffleupagus/_abortOperatorList-clearTimeout

Browse Source 
Always abort a pending `streamReader` cancel timeout in `PDFPageProxy._abortOperatorList` (PR 15825 follow-up)
This commit is contained in:
Jonas Jenwald 2022-12-27 13:26:43 +01:00 committed by GitHub
commit 3110d1f29a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/display/api.js
View File

@ -1821,6 +1821,12 @@ class PDFPageProxy {
if (!intentState.streamReader) { if (!intentState.streamReader) {
return; return;
} }
// Ensure that a pending `streamReader` cancel timeout is always aborted.
if (intentState.streamReaderCancelTimeout) {
clearTimeout(intentState.streamReaderCancelTimeout);
intentState.streamReaderCancelTimeout = null;
}
if (!force) { if (!force) {
// Ensure that an Error occurring in *only* one `InternalRenderTask`, e.g. // Ensure that an Error occurring in *only* one `InternalRenderTask`, e.g.
// multiple render() calls on the same canvas, won't break all rendering. // multiple render() calls on the same canvas, won't break all rendering.
@ -1837,12 +1843,9 @@ class PDFPageProxy {
delay += reason.extraDelay; delay += reason.extraDelay;
} }
if (intentState.streamReaderCancelTimeout) {
clearTimeout(intentState.streamReaderCancelTimeout);
}
intentState.streamReaderCancelTimeout = setTimeout(() => { intentState.streamReaderCancelTimeout = setTimeout(() => {
this._abortOperatorList({ intentState, reason, force: true });
intentState.streamReaderCancelTimeout = null; intentState.streamReaderCancelTimeout = null;
this._abortOperatorList({ intentState, reason, force: true });
}, delay); }, delay);
return; return;
} }