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

Convert the ChunkedStreamManager.chunksNeededByRequest property to a Map (containing Sets)

Browse Source 
Compared to regular `Object`s, `Map`s (and `Set`s) have a number of advantageous properties: Of particular importance in this case is the built-in iteration support, and that determining if the structure is empty is easy.
This commit is contained in:
Jonas Jenwald 2020-06-09 11:46:56 +02:00
parent a4fa4554d6
commit 17e23ffb33
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/chunked_stream.js
View File

@ -319,7 +319,7 @@ class ChunkedStreamManager {
this.currRequestId = 0; this.currRequestId = 0;
this.chunksNeededByRequest = Object.create(null); this._chunksNeededByRequest = new Map();
this.requestsByChunk = Object.create(null); this.requestsByChunk = Object.create(null);
this.promisesByRequest = Object.create(null); this.promisesByRequest = Object.create(null);
this.progressiveDataLength = 0; this.progressiveDataLength = 0;
@ -384,15 +384,15 @@ class ChunkedStreamManager {
_requestChunks(chunks) { _requestChunks(chunks) {
const requestId = this.currRequestId++; const requestId = this.currRequestId++;
const chunksNeeded = Object.create(null); const chunksNeeded = new Set();
this.chunksNeededByRequest[requestId] = chunksNeeded; this._chunksNeededByRequest.set(requestId, chunksNeeded);
for (const chunk of chunks) { for (const chunk of chunks) {
if (!this.stream.hasChunk(chunk)) { if (!this.stream.hasChunk(chunk)) {
chunksNeeded[chunk] = true; chunksNeeded.add(chunk);
} }
} }
if (isEmptyObj(chunksNeeded)) { if (chunksNeeded.size === 0) {
return Promise.resolve(); return Promise.resolve();
} }
@ -400,8 +400,7 @@ class ChunkedStreamManager {
this.promisesByRequest[requestId] = capability; this.promisesByRequest[requestId] = capability;
const chunksToRequest = []; const chunksToRequest = [];
for (let chunk in chunksNeeded) { for (const chunk of chunksNeeded) {
chunk = chunk | 0;
if (!(chunk in this.requestsByChunk)) { if (!(chunk in this.requestsByChunk)) {
this.requestsByChunk[chunk] = []; this.requestsByChunk[chunk] = [];
chunksToRequest.push(chunk); chunksToRequest.push(chunk);
@ -526,12 +525,12 @@ class ChunkedStreamManager {
delete this.requestsByChunk[curChunk]; delete this.requestsByChunk[curChunk];
for (const requestId of requestIds) { for (const requestId of requestIds) {
const chunksNeeded = this.chunksNeededByRequest[requestId]; const chunksNeeded = this._chunksNeededByRequest.get(requestId);
if (curChunk in chunksNeeded) { if (chunksNeeded.has(curChunk)) {
delete chunksNeeded[curChunk]; chunksNeeded.delete(curChunk);
} }
if (!isEmptyObj(chunksNeeded)) { if (chunksNeeded.size > 0) {
continue; continue;
} }
loadedRequests.push(requestId); loadedRequests.push(requestId);