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

Move the ImageBitmap clean-up into the PDFObjects class

Browse Source 
With upcoming changes we'll potentially start to cache `ImageBitmap` data at the document-level, in addition to just at the page-level.
Hence we need to ensure that such data is actually released on clean-up, and rather than duplicating the existing *manual* handling this code is instead moved into the `PDFObjects.clear` method. (In my opinion, this is an overall improvement even without globally cached `ImageBitmap` data.)

*Please note:* This patch is written using the GitHub UI, since I'm currently without a dev machine, so hopefully it's correct and makes sense.
This commit is contained in:
Jonas Jenwald 2023-02-21 12:00:45 +01:00 committed by GitHub
parent 534b22aec5
commit 1b076b7a35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/display/api.js
View File

@ -1282,8 +1282,6 @@ class PDFPageProxy {
this.commonObjs = transport.commonObjs; this.commonObjs = transport.commonObjs;
this.objs = new PDFObjects(); this.objs = new PDFObjects();
this._bitmaps = new Set();
this.cleanupAfterRender = false; this.cleanupAfterRender = false;
this.pendingCleanup = false; this.pendingCleanup = false;
this._intentStates = new Map(); this._intentStates = new Map();
@ -1679,10 +1677,6 @@ class PDFPageProxy {
} }
} }
this.objs.clear(); this.objs.clear();
for (const bitmap of this._bitmaps) {
bitmap.close();
}
this._bitmaps.clear();
this.pendingCleanup = false; this.pendingCleanup = false;
return Promise.all(waitOn); return Promise.all(waitOn);
} }
@ -1718,10 +1712,6 @@ class PDFPageProxy {
if (resetStats && this._stats) { if (resetStats && this._stats) {
this._stats = new StatTimer(); this._stats = new StatTimer();
} }
for (const bitmap of this._bitmaps) {
bitmap.close();
}
this._bitmaps.clear();
this.pendingCleanup = false; this.pendingCleanup = false;
return true; return true;
} }
@ -2774,9 +2764,8 @@ class WorkerTransport {
if (imageData) { if (imageData) {
let length; let length;
if (imageData.bitmap) { if (imageData.bitmap) {
const { bitmap, width, height } = imageData; const { width, height } = imageData;
length = width * height * 4; length = width * height * 4;
pageProxy._bitmaps.add(bitmap);
} else { } else {
length = imageData.data?.length || 0; length = imageData.data?.length || 0;
} }
@ -3150,6 +3139,10 @@ class PDFObjects {
} }
clear() { clear() {
for (const objId in this.#objs) {
const { data } = this.#objs[objId];
data?.bitmap?.close(); // Release any `ImageBitmap` data.
}
this.#objs = Object.create(null); this.#objs = Object.create(null);
} }
} }