Merge pull request #16199 from Snuffleupagus/commonobj-FontInspector

Slightly reduce the size of the `FontInspector`-integration in the API
This commit is contained in:
Tim van der Meij 2023-03-25 15:27:01 +01:00 committed by GitHub
commit a1685fd0d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 13 deletions

View File

@ -2762,19 +2762,15 @@ class WorkerTransport {
break;
}
let fontRegistry = null;
if (params.pdfBug && globalThis.FontInspector?.enabled) {
fontRegistry = {
registerFont(font, url) {
globalThis.FontInspector.fontAdded(font, url);
},
};
}
const inspectFont =
params.pdfBug && globalThis.FontInspector?.enabled
? (font, url) => globalThis.FontInspector.fontAdded(font, url)
: null;
const font = new FontFaceObject(exportedData, {
isEvalSupported: params.isEvalSupported,
disableFontFace: params.disableFontFace,
ignoreErrors: params.ignoreErrors,
fontRegistry,
inspectFont,
});
this.fontLoader

View File

@ -322,7 +322,7 @@ class FontFaceObject {
isEvalSupported = true,
disableFontFace = false,
ignoreErrors = false,
fontRegistry = null,
inspectFont = null,
}
) {
this.compiledGlyphs = Object.create(null);
@ -333,7 +333,7 @@ class FontFaceObject {
this.isEvalSupported = isEvalSupported !== false;
this.disableFontFace = disableFontFace === true;
this.ignoreErrors = ignoreErrors === true;
this.fontRegistry = fontRegistry;
this._inspectFont = inspectFont;
}
createNativeFontFace() {
@ -357,7 +357,7 @@ class FontFaceObject {
);
}
this.fontRegistry?.registerFont(this);
this._inspectFont?.(this);
return nativeFontFace;
}
@ -379,7 +379,7 @@ class FontFaceObject {
rule = `@font-face {font-family:"${this.cssFontInfo.fontFamily}";${css}src:${url}}`;
}
this.fontRegistry?.registerFont(this, url);
this._inspectFont?.(this, url);
return rule;
}