Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the disableCanvasToImageConversion functionality from PDFThumbnailView (PR 7029 follow-up) #13357

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 1 addition & 24 deletions web/pdf_thumbnail_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ const THUMBNAIL_WIDTH = 98; // px
* @property {IPDFLinkService} linkService - The navigation/linking service.
* @property {PDFRenderingQueue} renderingQueue - The rendering queue object.
* @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.
*/

Expand Down Expand Up @@ -97,7 +94,6 @@ class PDFThumbnailView {
linkService,
renderingQueue,
checkSetImageDisabled,
disableCanvasToImageConversion = false,
l10n,
}) {
this.id = id;
Expand All @@ -121,7 +117,6 @@ class PDFThumbnailView {
function () {
return false;
};
this.disableCanvasToImageConversion = disableCanvasToImageConversion;

const pageWidth = this.viewport.width,
pageHeight = this.viewport.height,
Expand Down Expand Up @@ -260,20 +255,6 @@ class PDFThumbnailView {
}
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");
image.className = "thumbnailImage";
this._thumbPageCanvas.then(msg => {
Expand Down Expand Up @@ -501,11 +482,7 @@ class PDFThumbnailView {
}

this._thumbPageCanvas.then(msg => {
if (this.image) {
this.image.setAttribute("aria-label", msg);
} else if (this.canvas) {
this.canvas.setAttribute("aria-label", msg);
}
this.image?.setAttribute("aria-label", msg);
});
}
}
Expand Down
1 change: 0 additions & 1 deletion web/pdf_thumbnail_viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ class PDFThumbnailViewer {
linkService: this.linkService,
renderingQueue: this.renderingQueue,
checkSetImageDisabled,
disableCanvasToImageConversion: false,
l10n: this.l10n,
});
this._thumbnails.push(thumbnail);
Expand Down