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

[api-major] Remove the unused encrypted property from the pdfInfo object sent from the worker via the GetDoc message

Browse Source 
I recall being confused as to the purpose of the `encrypted` property all the way back when working on PR 4750.

Looking at the history, this property was added in PR 1698 when password support was added to the API/viewer. However, its only purpose seem to have been to facilitate the addition of a `isEncrypted` function in the API. That function never, as far as I can tell, saw any use and was unceremoniously removed in PR 4144.

Since we want to avoid sending all non-essential data early during initial document loading (e.g. PR 4750), it seems correct to get rid of the `encrypted` property. Especially since it hasn't even been exposed in the API for over three years, with no complaints that I'm aware of.

Finally note that the `encrypt` property on the `XRef` instance isn't tied to the code that's being removed here. Given that we're calling `PDFDocument.parse` during `createDocumentHandler` in the worker which, via `PDFDocument.setup`, calls `XRef.parse` where the `Encrypt` data (if it exists) is always parsed.
This commit is contained in:
Jonas Jenwald 2017-12-21 12:03:59 +01:00
parent e081a708c3
commit e58f2f513a
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/worker.js
View File

@ -402,19 +402,15 @@ var WorkerMessageHandler = {
var loadDocumentCapability = createPromiseCapability(); var loadDocumentCapability = createPromiseCapability();
var parseSuccess = function parseSuccess() { var parseSuccess = function parseSuccess() {
var numPagesPromise = pdfManager.ensureDoc('numPages'); Promise.all([
var fingerprintPromise = pdfManager.ensureDoc('fingerprint'); pdfManager.ensureDoc('numPages'),
var encryptedPromise = pdfManager.ensureXRef('encrypt'); pdfManager.ensureDoc('fingerprint'),
Promise.all([numPagesPromise, fingerprintPromise, ]).then(function([numPages, fingerprint]) {
encryptedPromise]).then(function onDocReady(results) { loadDocumentCapability.resolve({
var doc = { numPages,
numPages: results[0], fingerprint,
fingerprint: results[1], });
encrypted: !!results[2], }, parseFailure);
};
loadDocumentCapability.resolve(doc);
},
parseFailure);
}; };
var parseFailure = function parseFailure(e) { var parseFailure = function parseFailure(e) {

5
src/display/api.js
View File

@ -1649,9 +1649,8 @@ var WorkerTransport = (function WorkerTransportClosure() {
}; };
}, this); }, this);
messageHandler.on('GetDoc', function transportDoc(data) { messageHandler.on('GetDoc', function transportDoc({ pdfInfo, }) {
var pdfInfo = data.pdfInfo; this.numPages = pdfInfo.numPages;
this.numPages = data.pdfInfo.numPages;
var loadingTask = this.loadingTask; var loadingTask = this.loadingTask;
var pdfDocument = new PDFDocumentProxy(pdfInfo, this, loadingTask); var pdfDocument = new PDFDocumentProxy(pdfInfo, this, loadingTask);
this.pdfDocument = pdfDocument; this.pdfDocument = pdfDocument;