Merge pull request #21214 from Snuffleupagus/CFFFont-improvements

Remove the `CompilerOutput.prototype.finalData` getter, and a few other font improvements (PR 21053 follow-up)

Author: timvandermeij

src/core/cff_font.js

@@ -28,11 +28,12 @@ class CFFFont {
     this.seacs = this.cff.seacs;
     try {
       this.data = compiler.compile();
-    } catch {
-      warn("Failed to compile font " + properties.loadedName);
+    } catch (ex) {
+      warn(`Failed to compile font "${properties.loadedName}": "${ex}".`);
       // There may have just been an issue with the compiler, set the data
       // anyway and hope the font loaded.
-      this.data = file;
+      file.reset();
+      this.data = file.getBytes();
     }
     this._createBuiltInEncoding();
   }

src/core/cff_parser.js

@@ -1400,12 +1400,6 @@ class CompilerOutput {
     return this.#buf.subarray(0, this.#pos);
   }
 
-  get finalData() {
-    const data = this.#buf.slice(0, this.#pos);
-    this.#buf = null;
-    return data;
-  }
-
   get length() {
     return this.#pos;
   }
@@ -1534,7 +1528,7 @@ class CFFCompiler {
     // the sanitizer will bail out. Add a dummy byte to avoid that.
     output.add([0]);
 
-    return output.finalData;
+    return output.data;
   }
 
   encodeNumber(value) {

src/core/fonts.js

@@ -1519,14 +1519,20 @@ class Font {
         data[8] = data[9] = data[10] = data[11] = 0;
         data[17] |= 0x20; // Set font optimized for cleartype flag.
       }
+      // The "CFF " table may be replaced completely, hence its data shouldn't
+      // need to be read and/or modified piecewise through a `DataView`.
+      const view =
+        tag === "CFF "
+          ? null
+          : new DataView(data.buffer, data.byteOffset, data.byteLength);
 
       return {
         tag,
         checksum,
         length,
         offset,
         data,
-        view: new DataView(data.buffer, data.byteOffset, data.byteLength),
+        view,
       };
     }