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

Merge pull request #10499 from Snuffleupagus/renderTask-error-cleanup

Browse Source 
Attempt to clean-up/restore pending rendering operations when errors occurs while a `RenderTask` runs (PR 10202 follow-up)
This commit is contained in:
Tim van der Meij 2019-01-27 15:12:59 +01:00 committed by GitHub
commit 1f3e7700d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/display/api.js
View File

@ -2434,7 +2434,7 @@ const InternalRenderTask = (function InternalRenderTaskClosure() {
}
}
cancel() {
cancel(error = null) {
this.running = false;
this.cancelled = true;
if (this.gfx) {
@ -2443,8 +2443,8 @@ const InternalRenderTask = (function InternalRenderTaskClosure() {
if (this._canvas) {
canvasInRendering.delete(this._canvas);
}
this.callback(new RenderingCancelledException(
'Rendering cancelled, page ' + this.pageNumber, 'canvas'));
this.callback(error || new RenderingCancelledException(
`Rendering cancelled, page ${this.pageNumber}`, 'canvas'));
}
operatorListChanged() {
@ -2480,10 +2480,10 @@ const InternalRenderTask = (function InternalRenderTaskClosure() {
_scheduleNext() {
if (this._useRequestAnimationFrame) {
window.requestAnimationFrame(() => {
this._nextBound().catch(this.callback);
this._nextBound().catch(this.cancel.bind(this));
});
} else {
Promise.resolve().then(this._nextBound).catch(this.callback);
Promise.resolve().then(this._nextBound).catch(this.cancel.bind(this));
}
}

7
web/pdf_page_view.js
View File

@ -432,7 +432,7 @@ class PDFPageView {
};
}
let finishPaintTask = (error) => {
const finishPaintTask = async (error) => {
// The paintTask may have been replaced by a new one, so only remove
// the reference to the paintTask if it matches the one that is
// triggering this callback.
@ -442,7 +442,7 @@ class PDFPageView {
if (error instanceof RenderingCancelledException) {
this.error = null;
return Promise.resolve(undefined);
return;
}
this.renderingState = RenderingStates.FINISHED;
@ -465,9 +465,8 @@ class PDFPageView {
});
if (error) {
return Promise.reject(error);
throw error;
}
return Promise.resolve(undefined);
};
let paintTask = this.renderer === RendererType.SVG ?