mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-25 17:48:07 +02:00
Code Activity

Improve the consistency between the LocalPdfManager/NetworkPdfManager constructor

Browse source 
Currently these classes take a bunch of parameters (somewhat randomly ordered), probably because this is very old code that's been extended over the years.
Hence this patch changes the constructors to use parameter-objects instead, which improves consistency and (slightly) reduces the amount of code as well.

*Please note:* Also removes the `msgHandler`-property on these classes, since I cannot find a single call-site that accesses it.
This commit is contained in:
Jonas Jenwald 2023-02-11 12:34:20 +01:00
parent 903adc8708
commit 18042163ce
2 changed files with 36 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/core/worker.js
View file

@ -210,20 +210,26 @@ class WorkerMessageHandler {
enableXfa,
evaluatorOptions,
}) {
const pdfManagerArgs = {
source: null,
disableAutoFetch,
docBaseUrl,
docId,
enableXfa,
evaluatorOptions,
handler,
length,
password,
rangeChunkSize,
};
const pdfManagerCapability = createPromiseCapability();
let newPdfManager;
if (data) {
try {
newPdfManager = new LocalPdfManager(
docId,
data,
password,
handler,
evaluatorOptions,
enableXfa,
docBaseUrl
);
pdfManagerArgs.source = data;
newPdfManager = new LocalPdfManager(pdfManagerArgs);
pdfManagerCapability.resolve(newPdfManager);
} catch (ex) {
pdfManagerCapability.reject(ex);
@ -246,24 +252,13 @@ class WorkerMessageHandler {
if (!fullRequest.isRangeSupported) {
return;
}
pdfManagerArgs.source = pdfStream;
pdfManagerArgs.length = fullRequest.contentLength;
// We don't need auto-fetch when streaming is enabled.
disableAutoFetch =
disableAutoFetch || fullRequest.isStreamingSupported;
pdfManagerArgs.disableAutoFetch =
pdfManagerArgs.disableAutoFetch || fullRequest.isStreamingSupported;
newPdfManager = new NetworkPdfManager(
docId,
pdfStream,
{
msgHandler: handler,
password,
length: fullRequest.contentLength,
disableAutoFetch,
rangeChunkSize,
},
evaluatorOptions,
enableXfa,
docBaseUrl
);
newPdfManager = new NetworkPdfManager(pdfManagerArgs);
// There may be a chance that `newPdfManager` is not initialized for
// the first few runs of `readchunk` block of code. Be sure to send
// all cached chunks, if any, to chunked_stream via pdf_manager.
@ -288,15 +283,9 @@ class WorkerMessageHandler {
}
// the data is array, instantiating directly from it
try {
newPdfManager = new LocalPdfManager(
docId,
pdfFile,
password,
handler,
evaluatorOptions,
enableXfa,
docBaseUrl
);
pdfManagerArgs.source = pdfFile;
newPdfManager = new LocalPdfManager(pdfManagerArgs);
pdfManagerCapability.resolve(newPdfManager);
} catch (ex) {
pdfManagerCapability.reject(ex);