ZenBrowserMirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/zen-browser/pdf.js.git synced 2025-07-10 02:05:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[api-minor] Implement basic support for OptionalContent Usage dicts (issue 5764, bug 1826783)

Browse source 
The following are some highlights of this patch:
 - In the Worker we only extract a *subset* of the potential contents of the `Usage` dictionary, to avoid having to implement/test a bunch of code that'd be completely unused in the viewer.

 - In order to still allow the user to *manually* override the default visible layers in the viewer, the viewable/printable state is purposely *not* enforced during initialization in the `OptionalContentConfig` constructor.

 - Printing will now always use the *default* visible layers, rather than using the same state as the viewer (as was the case previously).
   This ensures that the printing-output will correctly take the `Usage` dictionary into account, and in practice toggling of visible layers rarely seem to be necessary except in the viewer itself (if at all).[1]

---
[1] In the unlikely case that it'd ever be deemed necessary to support fine-grained control of optional content visibility during printing, some new (additional) UI would likely be needed to support that case.
This commit is contained in:
Jonas Jenwald 2024-02-25 14:12:36 +01:00
parent e647311a89
commit 3c78ff5fb0
13 changed files with 186 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

22
web/pdf_print_service.js
View file

@ -13,7 +13,12 @@
* limitations under the License.
*/
import { AnnotationMode, PixelsPerInch, shadow } from "pdfjs-lib";
import {
AnnotationMode,
PixelsPerInch,
RenderingCancelledException,
shadow,
} from "pdfjs-lib";
import { getXfaHtmlForPrinting } from "./print_utils.js";
let activeService = null;
@ -58,7 +63,14 @@ function renderPage(
optionalContentConfigPromise,
printAnnotationStorage,
};
return pdfPage.render(renderContext).promise;
const renderTask = pdfPage.render(renderContext);
return renderTask.promise.catch(reason => {
if (!(reason instanceof RenderingCancelledException)) {
console.error(reason);
}
throw reason;
});
});
}
@ -68,15 +80,15 @@ class PDFPrintService {
pagesOverview,
printContainer,
printResolution,
optionalContentConfigPromise = null,
printAnnotationStoragePromise = null,
}) {
this.pdfDocument = pdfDocument;
this.pagesOverview = pagesOverview;
this.printContainer = printContainer;
this._printResolution = printResolution || 150;
this._optionalContentConfigPromise =
optionalContentConfigPromise || pdfDocument.getOptionalContentConfig();
this._optionalContentConfigPromise = pdfDocument.getOptionalContentConfig({
intent: "print",
});
this._printAnnotationStoragePromise =
printAnnotationStoragePromise || Promise.resolve();
this.currentPage = -1;