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

Merge pull request #12886 from Snuffleupagus/_getSaveFieldResources-fontName

Browse Source 
Use `_defaultAppearanceData` directly in `WidgetAnnotation._getSaveFieldResources` (PR 12831 follow-up)
This commit is contained in:
Tim van der Meij 2021-01-22 20:08:59 +01:00 committed by GitHub
commit 5b675c7bf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/annotation.js
View File

@ -1266,8 +1266,6 @@ class WidgetAnnotation extends Annotation {
}
async _getAppearance(evaluator, task, annotationStorage) {
this._fontName = null;
const isPassword = this.hasFieldFlag(AnnotationFieldFlag.PASSWORD);
if (!annotationStorage || isPassword) {
return null;
@ -1303,7 +1301,6 @@ class WidgetAnnotation extends Annotation {
const font = await this._getFontData(evaluator, task);
const fontSize = this._computeFontSize(font, totalHeight);
this._fontName = this._defaultAppearanceData.fontName.name;
let descent = font.descent;
if (isNaN(descent)) {
@ -1459,34 +1456,35 @@ class WidgetAnnotation extends Annotation {
PDFJSDev.test("!PRODUCTION || TESTING")
) {
assert(
this._fontName !== undefined,
"Expected `_getAppearance()` to have been called."
this._defaultAppearanceData,
"Expected `_defaultAppearanceData` to have been set."
);
}
const {
localResources,
acroFormResources,
appearanceResources,
acroFormResources,
} = this._fieldResources;
if (!this._fontName) {
const fontNameStr =
this._defaultAppearanceData && this._defaultAppearanceData.fontName.name;
if (!fontNameStr) {
return localResources || Dict.empty;
}
for (const resources of [localResources, appearanceResources]) {
if (resources instanceof Dict) {
const localFont = resources.get("Font");
if (localFont instanceof Dict && localFont.has(this._fontName)) {
if (localFont instanceof Dict && localFont.has(fontNameStr)) {
return resources;
}
}
}
if (acroFormResources instanceof Dict) {
const acroFormFont = acroFormResources.get("Font");
if (acroFormFont instanceof Dict && acroFormFont.has(this._fontName)) {
if (acroFormFont instanceof Dict && acroFormFont.has(fontNameStr)) {
const subFontDict = new Dict(xref);
subFontDict.set(this._fontName, acroFormFont.getRaw(this._fontName));
subFontDict.set(fontNameStr, acroFormFont.getRaw(fontNameStr));
const subResourcesDict = new Dict(xref);
subResourcesDict.set("Font", subFontDict);