Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-05-23 19:30:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change the Font.prototype.glyphCacheValues method to return an iterator

Browse Source 
This method is only used with loops, and it should be a tiny bit more efficient to use an iterator directly rather than first iterating through the underlying data to create a temporary `Array` that we finally iterate through at the call-site.

*Please note:* As port of these changes the chars/glyph caches, on the `Font` instances, are changed to use `Map`s rather than Objects.
This commit is contained in:
Jonas Jenwald 2026-03-09 16:18:48 +01:00
parent 8bbb7c88d3
commit dbb6ffb8d5
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/fonts.js
View File

@ -969,6 +969,10 @@ function createNameTable(name, proto) {
* decoding logics whatever type it is (assuming the font type is supported). * decoding logics whatever type it is (assuming the font type is supported).
*/ */
class Font { class Font {
#charsCache = new Map();
#glyphCache = new Map();
constructor(name, file, properties, evaluatorOptions) { constructor(name, file, properties, evaluatorOptions) {
this.name = name; this.name = name;
this.psName = null; this.psName = null;
@ -981,9 +985,6 @@ class Font {
this.missingFile = false; this.missingFile = false;
this.cssFontInfo = properties.cssFontInfo; this.cssFontInfo = properties.cssFontInfo;
this._charsCache = Object.create(null);
this._glyphCache = Object.create(null);
let isSerifFont = !!(properties.flags & FontFlags.Serif); let isSerifFont = !!(properties.flags & FontFlags.Serif);
// Fallback to checking the font name, in order to improve text-selection, // Fallback to checking the font name, in order to improve text-selection,
// since the /Flags-entry is often wrong (fixes issue13845.pdf). // since the /Flags-entry is often wrong (fixes issue13845.pdf).
@ -3385,7 +3386,7 @@ class Font {
* @private * @private
*/ */
_charToGlyph(charcode, isSpace = false) { _charToGlyph(charcode, isSpace = false) {
let glyph = this._glyphCache[charcode]; let glyph = this.#glyphCache.get(charcode);
// All `Glyph`-properties, except `isSpace` in multi-byte strings, // All `Glyph`-properties, except `isSpace` in multi-byte strings,
// depend indirectly on the `charcode`. // depend indirectly on the `charcode`.
if (glyph?.isSpace === isSpace) { if (glyph?.isSpace === isSpace) {
@ -3480,12 +3481,13 @@ class Font {
isSpace, isSpace,
isInFont isInFont
); );
return (this._glyphCache[charcode] = glyph); this.#glyphCache.set(charcode, glyph);
return glyph;
} }
charsToGlyphs(chars) { charsToGlyphs(chars) {
// If we translated this string before, just grab it from the cache. // If we translated this string before, just grab it from the cache.
let glyphs = this._charsCache[chars]; let glyphs = this.#charsCache.get(chars);
if (glyphs) { if (glyphs) {
return glyphs; return glyphs;
} }
@ -3517,7 +3519,8 @@ class Font {
} }
// Enter the translated string into the cache. // Enter the translated string into the cache.
return (this._charsCache[chars] = glyphs); this.#charsCache.set(chars, glyphs);
return glyphs;
} }
/** /**
@ -3549,7 +3552,7 @@ class Font {
} }
get glyphCacheValues() { get glyphCacheValues() {
return Object.values(this._glyphCache); return this.#glyphCache.values();
} }
/** /**