From 38acde837543d020ab88e40fcae0c29566b50efe Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Wed, 31 Mar 2021 14:40:21 +0200
Subject: [PATCH 1/2] Use template strings, to reduce unnecessary verbosity in
 a few `warn(...)` calls in `src/core/annotation.js`

---
 src/core/annotation.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/core/annotation.js b/src/core/annotation.js
index d6ace4016..f2b54ffe0 100644
--- a/src/core/annotation.js
+++ b/src/core/annotation.js
@@ -128,9 +128,7 @@ class AnnotationFactory {
             return new ChoiceWidgetAnnotation(parameters);
         }
         warn(
-          'Unimplemented widget field type "' +
-            fieldType +
-            '", ' +
+          `Unimplemented widget field type "${fieldType}", ` +
             "falling back to base field type."
         );
         return new WidgetAnnotation(parameters);
@@ -186,9 +184,7 @@ class AnnotationFactory {
             warn("Annotation is missing the required /Subtype.");
           } else {
             warn(
-              'Unimplemented annotation type "' +
-                subtype +
-                '", ' +
+              `Unimplemented annotation type "${subtype}", ` +
                 "falling back to base annotation."
             );
           }

From 3df24254e350f3d7beb5edfd612e697898c6cfd0 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Wed, 31 Mar 2021 14:48:28 +0200
Subject: [PATCH 2/2] [api-minor] Stop exposing the *raw*
 `defaultAppearance`-string on Annotation-instances

The reasons for making this change are:
 - This property is not, nor has it ever been, used anywhere in the PDF.js display-layer.
 - Related to the previous point, the format of the `defaultAppearance`-string is such that it'd be difficult to use it as-is in the display-layer anyway.
 - It (usually) contains the "raw" appearance-string, from the PDF document, which is neither parsed nor validated and could thus be bogus.
 - We now expose a `defaultAppearanceData`-property, which is first of all used in the display-layer and secondly contains actually parsed/validated data.
 - In the event that a third-party implementation needs the `defaultAppearance`-string, it could be easily constructed from the recently added `defaultAppearanceData`-property.

All-in-all, I'm thus suggesting that we stop exposing an unused and unnecessary property on all Annotation-instances.
---
 src/core/annotation.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/core/annotation.js b/src/core/annotation.js
index f2b54ffe0..e96d0881f 100644
--- a/src/core/annotation.js
+++ b/src/core/annotation.js
@@ -1115,14 +1115,15 @@ class WidgetAnnotation extends Annotation {
     data.defaultFieldValue = this._decodeFormValue(defaultFieldValue);
 
     data.alternativeText = stringToPDFString(dict.get("TU") || "");
+
     const defaultAppearance =
-      getInheritableProperty({ dict, key: "DA" }) ||
-      params.acroForm.get("DA") ||
-      "";
-    data.defaultAppearance = isString(defaultAppearance)
+      getInheritableProperty({ dict, key: "DA" }) || params.acroForm.get("DA");
+    this._defaultAppearance = isString(defaultAppearance)
       ? defaultAppearance
       : "";
-    data.defaultAppearanceData = parseDefaultAppearance(data.defaultAppearance);
+    data.defaultAppearanceData = parseDefaultAppearance(
+      this._defaultAppearance
+    );
 
     const fieldType = getInheritableProperty({ dict, key: "FT" });
     data.fieldType = isName(fieldType) ? fieldType.name : null;
@@ -1228,7 +1229,7 @@ class WidgetAnnotation extends Annotation {
 
         // Even if there is an appearance stream, ignore it. This is the
         // behaviour used by Adobe Reader.
-        if (!this.data.defaultAppearance || content === null) {
+        if (!this._defaultAppearance || content === null) {
           return operatorList;
         }
 
@@ -1374,15 +1375,14 @@ class WidgetAnnotation extends Annotation {
     const totalHeight = this.data.rect[3] - this.data.rect[1];
     const totalWidth = this.data.rect[2] - this.data.rect[0];
 
-    if (!this.data.defaultAppearance) {
+    if (!this._defaultAppearance) {
       // The DA is required and must be a string.
       // If there is no font named Helvetica in the resource dictionary,
       // the evaluator will fall back to a default font.
       // Doing so prevents exceptions and allows saving/printing
       // the file as expected.
-      this.data.defaultAppearance = "/Helvetica 0 Tf 0 g";
       this.data.defaultAppearanceData = parseDefaultAppearance(
-        this.data.defaultAppearance
+        (this._defaultAppearance = "/Helvetica 0 Tf 0 g")
       );
     }
 
@@ -1483,7 +1483,7 @@ class WidgetAnnotation extends Annotation {
 
   _computeFontSize(height, lineCount) {
     let { fontSize } = this.data.defaultAppearanceData;
-    if (fontSize === null || fontSize === 0) {
+    if (!fontSize) {
       // A zero value for size means that the font shall be auto-sized:
       // its size shall be computed as a function of the height of the
       // annotation rectangle (see 12.7.3.3).
@@ -1512,13 +1512,13 @@ class WidgetAnnotation extends Annotation {
       }
 
       const { fontName, fontColor } = this.data.defaultAppearanceData;
-      this.data.defaultAppearance = createDefaultAppearance({
+      this._defaultAppearance = createDefaultAppearance({
         fontSize,
         fontName,
         fontColor,
       });
     }
-    return [this.data.defaultAppearance, fontSize];
+    return [this._defaultAppearance, fontSize];
   }
 
   _renderText(text, font, fontSize, totalWidth, alignment, hPadding, vPadding) {