From fd35cda8bc3370e1bd412b4ee7d7c5900c31e78c Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Tue, 18 Oct 2022 17:20:25 +0200
Subject: [PATCH] Re-factor the glyph-cache lookup in the `Font._charToGlyph`
 method

With the changes in the previous patch we can move the glyph-cache lookup to the top of the method and thus avoid a bunch of, in *almost* every case, completely unnecessary re-parsing for every `charCode`.
---
 src/core/fonts.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/core/fonts.js b/src/core/fonts.js
index 09eba857f..b42486506 100644
--- a/src/core/fonts.js
+++ b/src/core/fonts.js
@@ -3225,6 +3225,12 @@ class Font {
    * @private
    */
   _charToGlyph(charcode, isSpace = false) {
+    let glyph = this._glyphCache[charcode];
+    // All `Glyph`-properties, except `isSpace` in multi-byte strings,
+    // depend indirectly on the `charcode`.
+    if (glyph && glyph.isSpace === isSpace) {
+      return glyph;
+    }
     let fontCharCode, width, operatorListId;
 
     let widthCode = charcode;
@@ -3289,24 +3295,18 @@ class Font {
       }
     }
 
-    let glyph = this._glyphCache[charcode];
-    // All `Glyph`-properties, except `isSpace` in multi-byte strings,
-    // depend indirectly on the `charcode`.
-    if (!glyph || glyph.isSpace !== isSpace) {
-      glyph = new Glyph(
-        charcode,
-        fontChar,
-        unicode,
-        accent,
-        width,
-        vmetric,
-        operatorListId,
-        isSpace,
-        isInFont
-      );
-      this._glyphCache[charcode] = glyph;
-    }
-    return glyph;
+    glyph = new Glyph(
+      charcode,
+      fontChar,
+      unicode,
+      accent,
+      width,
+      vmetric,
+      operatorListId,
+      isSpace,
+      isInFont
+    );
+    return (this._glyphCache[charcode] = glyph);
   }
 
   charsToGlyphs(chars) {