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

Merge pull request #13357 from Snuffleupagus/rm-disableCanvasToImageConversion

Browse Source 
Remove the `disableCanvasToImageConversion` functionality from `PDFThumbnailView` (PR 7029 follow-up)
This commit is contained in:
Tim van der Meij 2021-05-09 15:42:47 +02:00 committed by GitHub
commit 99eac86478
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
web/pdf_thumbnail_view.js
View File

@ -33,9 +33,6 @@ const THUMBNAIL_WIDTH = 98; // px
* @property {IPDFLinkService} linkService - The navigation/linking service. * @property {IPDFLinkService} linkService - The navigation/linking service.
* @property {PDFRenderingQueue} renderingQueue - The rendering queue object. * @property {PDFRenderingQueue} renderingQueue - The rendering queue object.
* @property {function} checkSetImageDisabled * @property {function} checkSetImageDisabled
* @property {boolean} [disableCanvasToImageConversion] - Don't convert the
* canvas thumbnails to images. This prevents `toDataURL` calls, but
* increases the overall memory usage. The default value is `false`.
* @property {IL10n} l10n - Localization service. * @property {IL10n} l10n - Localization service.
*/ */
@ -97,7 +94,6 @@ class PDFThumbnailView {
linkService, linkService,
renderingQueue, renderingQueue,
checkSetImageDisabled, checkSetImageDisabled,
disableCanvasToImageConversion = false,
l10n, l10n,
}) { }) {
this.id = id; this.id = id;
@ -121,7 +117,6 @@ class PDFThumbnailView {
function () { function () {
return false; return false;
}; };
this.disableCanvasToImageConversion = disableCanvasToImageConversion;
const pageWidth = this.viewport.width, const pageWidth = this.viewport.width,
pageHeight = this.viewport.height, pageHeight = this.viewport.height,
@ -260,20 +255,6 @@ class PDFThumbnailView {
} }
const reducedCanvas = this._reduceImage(canvas); const reducedCanvas = this._reduceImage(canvas);
if (this.disableCanvasToImageConversion) {
reducedCanvas.className = "thumbnailImage";
this._thumbPageCanvas.then(msg => {
reducedCanvas.setAttribute("aria-label", msg);
});
reducedCanvas.style.width = this.canvasWidth + "px";
reducedCanvas.style.height = this.canvasHeight + "px";
this.canvas = reducedCanvas;
this.div.setAttribute("data-loaded", true);
this.ring.appendChild(reducedCanvas);
return;
}
const image = document.createElement("img"); const image = document.createElement("img");
image.className = "thumbnailImage"; image.className = "thumbnailImage";
this._thumbPageCanvas.then(msg => { this._thumbPageCanvas.then(msg => {
@ -501,11 +482,7 @@ class PDFThumbnailView {
} }
this._thumbPageCanvas.then(msg => { this._thumbPageCanvas.then(msg => {
if (this.image) { this.image?.setAttribute("aria-label", msg);
this.image.setAttribute("aria-label", msg);
} else if (this.canvas) {
this.canvas.setAttribute("aria-label", msg);
}
}); });
} }
} }

1
web/pdf_thumbnail_viewer.js
View File

@ -209,7 +209,6 @@ class PDFThumbnailViewer {
linkService: this.linkService, linkService: this.linkService,
renderingQueue: this.renderingQueue, renderingQueue: this.renderingQueue,
checkSetImageDisabled, checkSetImageDisabled,
disableCanvasToImageConversion: false,
l10n: this.l10n, l10n: this.l10n,
}); });
this._thumbnails.push(thumbnail); this._thumbnails.push(thumbnail);