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

Merge pull request #17667 from Snuffleupagus/createPrintService-params

Browse Source 
Change `PDFPrintServiceFactory.createPrintService` to take a parameter object
This commit is contained in:
Tim van der Meij 2024-02-17 14:54:53 +01:00 committed by GitHub
commit fd5d040073
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
web/app.js
View File

@ -1781,26 +1781,19 @@ const PDFViewerApplication = {
return; return;
} }
const pagesOverview = this.pdfViewer.getPagesOverview(); this.printService = PDFPrintServiceFactory.createPrintService({
const printContainer = this.appConfig.printContainer; pdfDocument: this.pdfDocument,
const printResolution = AppOptions.get("printResolution"); pagesOverview: this.pdfViewer.getPagesOverview(),
const optionalContentConfigPromise = printContainer: this.appConfig.printContainer,
this.pdfViewer.optionalContentConfigPromise; printResolution: AppOptions.get("printResolution"),
optionalContentConfigPromise: this.pdfViewer.optionalContentConfigPromise,
const printService = PDFPrintServiceFactory.createPrintService( printAnnotationStoragePromise: this._printAnnotationStoragePromise,
this.pdfDocument, });
pagesOverview,
printContainer,
printResolution,
optionalContentConfigPromise,
this._printAnnotationStoragePromise
);
this.printService = printService;
this.forceRendering(); this.forceRendering();
// Disable the editor-indicator during printing (fixes bug 1790552). // Disable the editor-indicator during printing (fixes bug 1790552).
this.setTitle(); this.setTitle();
printService.layout(); this.printService.layout();
if (this._hasAnnotationEditors) { if (this._hasAnnotationEditors) {
this.externalServices.reportTelemetry({ this.externalServices.reportTelemetry({

24
web/firefox_print_service.js
View File

@ -114,14 +114,14 @@ function composePage(
} }
class FirefoxPrintService { class FirefoxPrintService {
constructor( constructor({
pdfDocument, pdfDocument,
pagesOverview, pagesOverview,
printContainer, printContainer,
printResolution, printResolution,
optionalContentConfigPromise = null, optionalContentConfigPromise = null,
printAnnotationStoragePromise = null printAnnotationStoragePromise = null,
) { }) {
this.pdfDocument = pdfDocument; this.pdfDocument = pdfDocument;
this.pagesOverview = pagesOverview; this.pagesOverview = pagesOverview;
this.printContainer = printContainer; this.printContainer = printContainer;
@ -202,22 +202,8 @@ class PDFPrintServiceFactory {
return shadow(this, "supportsPrinting", "mozPrintCallback" in canvas); return shadow(this, "supportsPrinting", "mozPrintCallback" in canvas);
} }
static createPrintService( static createPrintService(params) {
pdfDocument, return new FirefoxPrintService(params);
pagesOverview,
printContainer,
printResolution,
optionalContentConfigPromise,
printAnnotationStoragePromise
) {
return new FirefoxPrintService(
pdfDocument,
pagesOverview,
printContainer,
printResolution,
optionalContentConfigPromise,
printAnnotationStoragePromise
);
} }
} }

25
web/pdf_print_service.js
View File

@ -63,14 +63,14 @@ function renderPage(
} }
class PDFPrintService { class PDFPrintService {
constructor( constructor({
pdfDocument, pdfDocument,
pagesOverview, pagesOverview,
printContainer, printContainer,
printResolution, printResolution,
optionalContentConfigPromise = null, optionalContentConfigPromise = null,
printAnnotationStoragePromise = null printAnnotationStoragePromise = null,
) { }) {
this.pdfDocument = pdfDocument; this.pdfDocument = pdfDocument;
this.pagesOverview = pagesOverview; this.pagesOverview = pagesOverview;
this.printContainer = printContainer; this.printContainer = printContainer;
@ -367,26 +367,11 @@ class PDFPrintServiceFactory {
return shadow(this, "supportsPrinting", true); return shadow(this, "supportsPrinting", true);
} }
static createPrintService( static createPrintService(params) {
pdfDocument,
pagesOverview,
printContainer,
printResolution,
optionalContentConfigPromise,
printAnnotationStoragePromise
) {
if (activeService) { if (activeService) {
throw new Error("The print service is created and active."); throw new Error("The print service is created and active.");
} }
activeService = new PDFPrintService( return (activeService = new PDFPrintService(params));
pdfDocument,
pagesOverview,
printContainer,
printResolution,
optionalContentConfigPromise,
printAnnotationStoragePromise
);
return activeService;
} }
} }