1 files changed, 76 insertions, 18 deletions

diff --git a/toolkit/components/pdfjs/content/build/pdf.js b/toolkit/components/pdfjs/content/build/pdf.js
index 017a45914e..d2034d412b 100644
--- a/toolkit/components/pdfjs/content/build/pdf.js
+++ b/toolkit/components/pdfjs/content/build/pdf.js
@@ -829,6 +829,18 @@ function normalizeUnicode(str) {
     return p1 ? p1.normalize("NFKC") : NormalizationMap.get(p2);
   });
 }
+const FontRenderOps = {
+  BEZIER_CURVE_TO: 0,
+  MOVE_TO: 1,
+  LINE_TO: 2,
+  QUADRATIC_CURVE_TO: 3,
+  RESTORE: 4,
+  SAVE: 5,
+  SCALE: 6,
+  TRANSFORM: 7,
+  TRANSLATE: 8
+};
+exports.FontRenderOps = FontRenderOps;
 
 /***/ }),
 /* 2 */
@@ -965,7 +977,6 @@ function getDocument(src) {
   };
   const transportParams = {
     ignoreErrors,
-    isEvalSupported,
     disableFontFace,
     fontExtraProperties,
     enableXfa,
@@ -2153,7 +2164,6 @@ class WorkerTransport {
           }
           const inspectFont = params.pdfBug && globalThis.FontInspector?.enabled ? (font, url) => globalThis.FontInspector.fontAdded(font, url) : null;
           const font = new _font_loader.FontFaceObject(exportedData, {
-            isEvalSupported: params.isEvalSupported,
             disableFontFace: params.disableFontFace,
             ignoreErrors: params.ignoreErrors,
             inspectFont
@@ -4760,7 +4770,6 @@ class FontLoader {
 exports.FontLoader = FontLoader;
 class FontFaceObject {
   constructor(translatedData, {
-    isEvalSupported = true,
     disableFontFace = false,
     ignoreErrors = false,
     inspectFont = null
@@ -4769,7 +4778,6 @@ class FontFaceObject {
     for (const i in translatedData) {
       this[i] = translatedData[i];
     }
-    this.isEvalSupported = isEvalSupported !== false;
     this.disableFontFace = disableFontFace === true;
     this.ignoreErrors = ignoreErrors === true;
     this._inspectFont = inspectFont;
@@ -4824,22 +4832,72 @@ class FontFaceObject {
         throw ex;
       }
       (0, _util.warn)(`getPathGenerator - ignoring character: "${ex}".`);
-      return this.compiledGlyphs[character] = function (c, size) {};
     }
-    if (this.isEvalSupported && _util.FeatureTest.isEvalSupported) {
-      const jsBuf = [];
-      for (const current of cmds) {
-        const args = current.args !== undefined ? current.args.join(",") : "";
-        jsBuf.push("c.", current.cmd, "(", args, ");\n");
-      }
-      return this.compiledGlyphs[character] = new Function("c", "size", jsBuf.join(""));
+    if (!Array.isArray(cmds) || cmds.length === 0) {
+      return this.compiledGlyphs[character] = function (c, size) {};
     }
-    return this.compiledGlyphs[character] = function (c, size) {
-      for (const current of cmds) {
-        if (current.cmd === "scale") {
-          current.args = [size, -size];
-        }
-        c[current.cmd].apply(c, current.args);
+     const commands = [];
+     for (let i = 0, ii = cmds.length; i < ii;) {
+       switch (cmds[i++]) {
+         case _util.FontRenderOps.BEZIER_CURVE_TO:
+           {
+             const [a, b, c, d, e, f] = cmds.slice(i, i + 6);
+             commands.push(ctx => ctx.bezierCurveTo(a, b, c, d, e, f));
+             i += 6;
+           }
+           break;
+         case _util.FontRenderOps.MOVE_TO:
+           {
+             const [a, b] = cmds.slice(i, i + 2);
+             commands.push(ctx => ctx.moveTo(a, b));
+             i += 2;
+           }
+           break;
+         case _util.FontRenderOps.LINE_TO:
+           {
+             const [a, b] = cmds.slice(i, i + 2);
+             commands.push(ctx => ctx.lineTo(a, b));
+             i += 2;
+           }
+           break;
+         case _util.FontRenderOps.QUADRATIC_CURVE_TO:
+           {
+             const [a, b, c, d] = cmds.slice(i, i + 4);
+             commands.push(ctx => ctx.quadraticCurveTo(a, b, c, d));
+             i += 4;
+           }
+           break;
+         case _util.FontRenderOps.RESTORE:
+           commands.push(ctx => ctx.restore());
+           break;
+         case _util.FontRenderOps.SAVE:
+           commands.push(ctx => ctx.save());
+           break;
+         case _util.FontRenderOps.SCALE:
+           _util.assert(commands.length === 2, "Scale command is only valid at the third position.");
+           break;
+         case _util.FontRenderOps.TRANSFORM:
+           {
+             const [a, b, c, d, e, f] = cmds.slice(i, i + 6);
+             commands.push(ctx => ctx.transform(a, b, c, d, e, f));
+             i += 6;
+           }
+           break;
+         case _util.FontRenderOps.TRANSLATE:
+           {
+             const [a, b] = cmds.slice(i, i + 2);
+             commands.push(ctx => ctx.translate(a, b));
+             i += 2;
+           }
+           break;
+       }
+     }
+     return this.compiledGlyphs[character] = function glyphDrawer(ctx, size) {
+       commands[0](ctx);
+       commands[1](ctx);
+       ctx.scale(size, -size);
+       for (let i = 2, ii = commands.length; i < ii; i++) {
+         commands[i](ctx);
       }
     };
   }