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

[src/display/api.js] Move the getRenderingIntent helper function into WorkerTransport

Browse Source 
By doing this re-factoring *separately*, since it's mostly a mechanical change, the size/scope of the next patch will be reduced somewhat.
This commit is contained in:
Jonas Jenwald 2021-08-15 19:28:47 +02:00
parent a936509b77
commit 1465b1670f
1 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/display/api.js
View File

@ -515,29 +515,6 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
}); });
} }
function getRenderingIntent(intent, { renderForms = false, isOpList = false }) {
let renderingIntent = RenderingIntentFlag.DISPLAY; // Default value.
switch (intent) {
case "any":
renderingIntent = RenderingIntentFlag.ANY;
break;
case "display":
break;
case "print":
renderingIntent = RenderingIntentFlag.PRINT;
break;
default:
warn(`getRenderingIntent - invalid intent: ${intent}`);
}
if (renderForms) {
renderingIntent += RenderingIntentFlag.ANNOTATION_FORMS;
}
if (isOpList) {
renderingIntent += RenderingIntentFlag.OPLIST;
}
return renderingIntent;
}
/** /**
* @typedef {Object} OnProgressParameters * @typedef {Object} OnProgressParameters
* @property {number} loaded - Currently loaded number of bytes. * @property {number} loaded - Currently loaded number of bytes.
@ -1302,7 +1279,7 @@ class PDFPageProxy {
* {Array} of the annotation objects. * {Array} of the annotation objects.
*/ */
getAnnotations({ intent = "display" } = {}) { getAnnotations({ intent = "display" } = {}) {
const renderingIntent = getRenderingIntent(intent, {}); const renderingIntent = this._transport.getRenderingIntent(intent, {});
let promise = this._annotationPromises.get(renderingIntent); let promise = this._annotationPromises.get(renderingIntent);
if (!promise) { if (!promise) {
@ -1358,7 +1335,7 @@ class PDFPageProxy {
this._stats.time("Overall"); this._stats.time("Overall");
} }
const renderingIntent = getRenderingIntent(intent, { const renderingIntent = this._transport.getRenderingIntent(intent, {
renderForms: renderInteractiveForms === true, renderForms: renderInteractiveForms === true,
}); });
// If there was a pending destroy, cancel it so no cleanup happens during // If there was a pending destroy, cancel it so no cleanup happens during
@ -1497,7 +1474,9 @@ class PDFPageProxy {
} }
} }
const renderingIntent = getRenderingIntent(intent, { isOpList: true }); const renderingIntent = this._transport.getRenderingIntent(intent, {
isOpList: true,
});
let intentState = this._intentStates.get(renderingIntent); let intentState = this._intentStates.get(renderingIntent);
if (!intentState) { if (!intentState) {
intentState = Object.create(null); intentState = Object.create(null);
@ -2354,6 +2333,33 @@ class WorkerTransport {
return shadow(this, "annotationStorage", new AnnotationStorage()); return shadow(this, "annotationStorage", new AnnotationStorage());
} }
getRenderingIntent(intent, { renderForms = false, isOpList = false }) {
let renderingIntent = RenderingIntentFlag.DISPLAY; // Default value.
switch (intent) {
case "any":
renderingIntent = RenderingIntentFlag.ANY;
break;
case "display":
break;
case "print":
renderingIntent = RenderingIntentFlag.PRINT;
break;
default:
warn(`getRenderingIntent - invalid intent: ${intent}`);
}
if (renderForms) {
renderingIntent += RenderingIntentFlag.ANNOTATION_FORMS;
}
if (isOpList) {
renderingIntent += RenderingIntentFlag.OPLIST;
}
return renderingIntent;
}
destroy() { destroy() {
if (this.destroyCapability) { if (this.destroyCapability) {
return this.destroyCapability.promise; return this.destroyCapability.promise;