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

Merge pull request #6468 from Snuffleupagus/issue-6467

Browse Source 
Don't clear the `canvas` until re-rendering is finished when the `scale` or `rotation` is changed (issue 6467)
This commit is contained in:
Brendan Dahl 2015-09-29 11:09:44 -07:00
commit 7cdc6f3c12
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
web/pdf_page_view.js
View File

@ -105,7 +105,7 @@ var PDFPageView = (function PDFPageViewClosure() {
} }
}, },
reset: function PDFPageView_reset(keepAnnotations) { reset: function PDFPageView_reset(keepZoomLayer, keepAnnotations) {
if (this.renderTask) { if (this.renderTask) {
this.renderTask.cancel(); this.renderTask.cancel();
} }
@ -117,12 +117,12 @@ var PDFPageView = (function PDFPageViewClosure() {
div.style.height = Math.floor(this.viewport.height) + 'px'; div.style.height = Math.floor(this.viewport.height) + 'px';
var childNodes = div.childNodes; var childNodes = div.childNodes;
var currentZoomLayer = this.zoomLayer || null; var currentZoomLayerNode = (keepZoomLayer && this.zoomLayer) || null;
var currentAnnotationNode = (keepAnnotations && this.annotationLayer && var currentAnnotationNode = (keepAnnotations && this.annotationLayer &&
this.annotationLayer.div) || null; this.annotationLayer.div) || null;
for (var i = childNodes.length - 1; i >= 0; i--) { for (var i = childNodes.length - 1; i >= 0; i--) {
var node = childNodes[i]; var node = childNodes[i];
if (currentZoomLayer === node || currentAnnotationNode === node) { if (currentZoomLayerNode === node || currentAnnotationNode === node) {
continue; continue;
} }
div.removeChild(node); div.removeChild(node);
@ -139,7 +139,7 @@ var PDFPageView = (function PDFPageViewClosure() {
this.annotationLayer = null; this.annotationLayer = null;
} }
if (this.canvas) { if (this.canvas && !currentZoomLayerNode) {
// Zeroing the width and height causes Firefox to release graphics // Zeroing the width and height causes Firefox to release graphics
// resources immediately, which can greatly reduce memory consumption. // resources immediately, which can greatly reduce memory consumption.
this.canvas.width = 0; this.canvas.width = 0;
@ -178,19 +178,21 @@ var PDFPageView = (function PDFPageViewClosure() {
} }
} }
if (this.canvas && if (this.canvas) {
(PDFJS.useOnlyCssZoom || if (PDFJS.useOnlyCssZoom ||
(this.hasRestrictedScaling && isScalingRestricted))) { (this.hasRestrictedScaling && isScalingRestricted)) {
this.cssTransform(this.canvas, true); this.cssTransform(this.canvas, true);
return; return;
} else if (this.canvas && !this.zoomLayer) { }
if (!this.zoomLayer) {
this.zoomLayer = this.canvas.parentNode; this.zoomLayer = this.canvas.parentNode;
this.zoomLayer.style.position = 'absolute'; this.zoomLayer.style.position = 'absolute';
} }
}
if (this.zoomLayer) { if (this.zoomLayer) {
this.cssTransform(this.zoomLayer.firstChild); this.cssTransform(this.zoomLayer.firstChild);
} }
this.reset(true); this.reset(/* keepZoomLayer = */ true, /* keepAnnotations = */ true);
}, },
/** /**
@ -401,6 +403,12 @@ var PDFPageView = (function PDFPageViewClosure() {
} }
if (self.zoomLayer) { if (self.zoomLayer) {
// Zeroing the width and height causes Firefox to release graphics
// resources immediately, which can greatly reduce memory consumption.
var zoomLayerCanvas = self.zoomLayer.firstChild;
zoomLayerCanvas.width = 0;
zoomLayerCanvas.height = 0;
div.removeChild(self.zoomLayer); div.removeChild(self.zoomLayer);
self.zoomLayer = null; self.zoomLayer = null;
} }