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

Change WorkerTransport.pagePromises from an Array to a Map

Browse Source 
Given that not all pages necessarily are being accessed, or that the pages may be accessed out of order, using a `Map` seems like a more appropriate data-structure here.

Finally, also changes the `pagePromises` to a *private* property since it's not supposed to be accessed from the "outside".
This commit is contained in:
Jonas Jenwald 2021-12-09 12:00:51 +01:00
parent c5525dcb69
commit f39536a30b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/display/api.js
View File

@ -2404,6 +2404,8 @@ class WorkerTransport {
#pageCache = new Map(); #pageCache = new Map();
#pagePromises = new Map();
constructor(messageHandler, loadingTask, networkStream, params) { constructor(messageHandler, loadingTask, networkStream, params) {
this.messageHandler = messageHandler; this.messageHandler = messageHandler;
this.loadingTask = loadingTask; this.loadingTask = loadingTask;
@ -2433,8 +2435,6 @@ class WorkerTransport {
this._networkStream = networkStream; this._networkStream = networkStream;
this._fullReader = null; this._fullReader = null;
this._lastProgress = null; this._lastProgress = null;
this.pagePromises = [];
this.downloadInfoCapability = createPromiseCapability(); this.downloadInfoCapability = createPromiseCapability();
this.setupMessageHandler(); this.setupMessageHandler();
@ -2518,7 +2518,7 @@ class WorkerTransport {
waitOn.push(page._destroy()); waitOn.push(page._destroy());
} }
this.#pageCache.clear(); this.#pageCache.clear();
this.pagePromises.length = 0; this.#pagePromises.clear();
// Allow `AnnotationStorage`-related clean-up when destroying the document. // Allow `AnnotationStorage`-related clean-up when destroying the document.
if (this.hasOwnProperty("annotationStorage")) { if (this.hasOwnProperty("annotationStorage")) {
this.annotationStorage.resetModified(); this.annotationStorage.resetModified();
@ -2920,9 +2920,10 @@ class WorkerTransport {
return Promise.reject(new Error("Invalid page request")); return Promise.reject(new Error("Invalid page request"));
} }
const pageIndex = pageNumber - 1; const pageIndex = pageNumber - 1,
if (pageIndex in this.pagePromises) { cachedPromise = this.#pagePromises.get(pageIndex);
return this.pagePromises[pageIndex]; if (cachedPromise) {
return cachedPromise;
} }
const promise = this.messageHandler const promise = this.messageHandler
.sendWithPromise("GetPage", { .sendWithPromise("GetPage", {
@ -2942,7 +2943,7 @@ class WorkerTransport {
this.#pageCache.set(pageIndex, page); this.#pageCache.set(pageIndex, page);
return page; return page;
}); });
this.pagePromises[pageIndex] = promise; this.#pagePromises.set(pageIndex, promise);
return promise; return promise;
} }