From db6f2f37185ec61b3c8a73cbfec7216399b400fa Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Fri, 14 Apr 2017 21:06:33 +0200 Subject: [PATCH] Ensure that `PDFThumbnailView.draw` is able to handle `RenderingCancelledException` correctly (PR 8157 follow-up) In PR 8157, I embarrassingly enough forgot to change `pdf_thumbnail_view.js` to match the changes made to `pdf_page_view.js`. --- web/pdf_thumbnail_view.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/pdf_thumbnail_view.js b/web/pdf_thumbnail_view.js index a67e6abff..ebbf039f7 100644 --- a/web/pdf_thumbnail_view.js +++ b/web/pdf_thumbnail_view.js @@ -14,6 +14,7 @@ */ import { getOutputScale, mozL10n } from './ui_utils'; +import { RenderingCancelledException } from './pdfjs'; import { RenderingStates } from './pdf_rendering_queue'; var THUMBNAIL_WIDTH = 98; // px @@ -288,8 +289,11 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() { if (renderTask === self.renderTask) { self.renderTask = null; } - if (error === 'cancelled') { - rejectRenderPromise(error); + + if (((typeof PDFJSDev === 'undefined' || + !PDFJSDev.test('PDFJS_NEXT')) && error === 'cancelled') || + error instanceof RenderingCancelledException) { + resolveRenderPromise(undefined); return; }