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

Zero the width/height of the temporary canvas used during TextLayer rendering

Browse Source 
The default size of these canvases seem to be `300 x 150` (two orders of magnitude larger than the ones in PR 10597), which probably is sufficient enough to matter since there's one such canvas for each textLayer that's rendered in the viewer.

Also fixes the incorrect rejection reason, i.e. one using a string rather than an `Error`, in the `TextLayerRenderTask.cancel` method.
This commit is contained in:
Jonas Jenwald 2019-03-01 03:32:40 +01:00
parent 34022d2fd1
commit d7d1f23826
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/display/text_layer.js
View File

@ -490,6 +490,17 @@ var renderTextLayer = (function renderTextLayerClosure() {
this._capability = createPromiseCapability(); this._capability = createPromiseCapability();
this._renderTimer = null; this._renderTimer = null;
this._bounds = []; this._bounds = [];
// Always clean-up the temporary canvas once rendering is no longer pending.
this._capability.promise.finally(() => {
if (this._layoutTextCtx) {
// Zeroing the width and height cause Firefox to release graphics
// resources immediately, which can greatly reduce memory consumption.
this._layoutTextCtx.canvas.width = 0;
this._layoutTextCtx.canvas.height = 0;
this._layoutTextCtx = null;
}
});
} }
TextLayerRenderTask.prototype = { TextLayerRenderTask.prototype = {
get promise() { get promise() {
@ -497,16 +508,16 @@ var renderTextLayer = (function renderTextLayerClosure() {
}, },
cancel: function TextLayer_cancel() { cancel: function TextLayer_cancel() {
this._canceled = true;
if (this._reader) { if (this._reader) {
this._reader.cancel(new AbortException('text layer task cancelled')); this._reader.cancel(new AbortException('TextLayer task cancelled.'));
this._reader = null; this._reader = null;
} }
this._canceled = true;
if (this._renderTimer !== null) { if (this._renderTimer !== null) {
clearTimeout(this._renderTimer); clearTimeout(this._renderTimer);
this._renderTimer = null; this._renderTimer = null;
} }
this._capability.reject('canceled'); this._capability.reject(new Error('TextLayer task cancelled.'));
}, },
_processItems(items, styleCache) { _processItems(items, styleCache) {