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

Merge pull request #6443 from Snuffleupagus/issue-6442

Browse Source 
Don't show thumbnails until the `canvas` to `image` conversion is done (issue 6442)
This commit is contained in:
Tim van der Meij 2015-09-12 13:38:25 +02:00
commit 11a0e1c5f7
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
web/pdf_thumbnail_view.js
View File

@ -184,9 +184,7 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
_getPageDrawContext: _getPageDrawContext:
function PDFThumbnailView_getPageDrawContext(noCtxScale) { function PDFThumbnailView_getPageDrawContext(noCtxScale) {
var canvas = document.createElement('canvas'); var canvas = document.createElement('canvas');
this.canvas = canvas; this.canvas = canvas;
this.div.setAttribute('data-loaded', true);
var ctx = canvas.getContext('2d'); var ctx = canvas.getContext('2d');
var outputScale = getOutputScale(ctx); var outputScale = getOutputScale(ctx);
@ -201,8 +199,9 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
} }
var image = document.createElement('img'); var image = document.createElement('img');
image.id = this.renderingId; this.image = image;
image.id = this.renderingId;
image.className = 'thumbnailImage'; image.className = 'thumbnailImage';
image.setAttribute('aria-label', mozL10n.get('thumb_page_canvas', image.setAttribute('aria-label', mozL10n.get('thumb_page_canvas',
{ page: this.id }, 'Thumbnail of Page {{page}}')); { page: this.id }, 'Thumbnail of Page {{page}}'));
@ -210,9 +209,6 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
image.style.width = canvas.style.width; image.style.width = canvas.style.width;
image.style.height = canvas.style.height; image.style.height = canvas.style.height;
this.image = image;
this.ring.appendChild(this.image);
return ctx; return ctx;
}, },
@ -220,16 +216,19 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
* @private * @private
*/ */
_convertCanvasToImage: function PDFThumbnailView_convertCanvasToImage() { _convertCanvasToImage: function PDFThumbnailView_convertCanvasToImage() {
if (!this.canvas) { if (!this.canvas) {
return; return;
} }
this.image.src = this.canvas.toDataURL(); this.image.src = this.canvas.toDataURL();
// Zeroing the width and height causes Firefox to release graphics this.div.setAttribute('data-loaded', true);
// resources immediately, which can greatly reduce memory consumption. this.ring.appendChild(this.image);
this.canvas.width = 0;
this.canvas.height = 0; // Zeroing the width and height causes Firefox to release graphics
delete this.canvas; // resources immediately, which can greatly reduce memory consumption.
this.canvas.width = 0;
this.canvas.height = 0;
delete this.canvas;
}, },
draw: function PDFThumbnailView_draw() { draw: function PDFThumbnailView_draw() {