Merge pull request #17770 from Aditi-1400/fix-issue-16843

Add language attribute to canvas
This commit is contained in:
Jonas Jenwald 2024-05-21 21:35:43 +02:00 committed by GitHub
commit 2a52fda11b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 7 deletions

View file

@ -81,7 +81,7 @@ class TextLayer {
static #ascentCache = new Map(); static #ascentCache = new Map();
static #canvasCtx = null; static #canvasContexts = new Map();
static #pendingTextLayers = new Set(); static #pendingTextLayers = new Set();
@ -423,13 +423,15 @@ class TextLayer {
return; return;
} }
this.#ascentCache.clear(); this.#ascentCache.clear();
for (const { canvas } of this.#canvasContexts.values()) {
this.#canvasCtx?.canvas.remove(); canvas.remove();
this.#canvasCtx = null; }
this.#canvasContexts.clear();
} }
static #getCtx(lang = null) { static #getCtx(lang = null) {
if (!this.#canvasCtx) { let canvasContext = this.#canvasContexts.get((lang ||= ""));
if (!canvasContext) {
// We don't use an OffscreenCanvas here because we use serif/sans serif // We don't use an OffscreenCanvas here because we use serif/sans serif
// fonts with it and they depends on the locale. // fonts with it and they depends on the locale.
// In Firefox, the <html> element get a lang attribute that depends on // In Firefox, the <html> element get a lang attribute that depends on
@ -442,10 +444,12 @@ class TextLayer {
// OffscreenCanvas. // OffscreenCanvas.
const canvas = document.createElement("canvas"); const canvas = document.createElement("canvas");
canvas.className = "hiddenCanvasElement"; canvas.className = "hiddenCanvasElement";
canvas.lang = lang;
document.body.append(canvas); document.body.append(canvas);
this.#canvasCtx = canvas.getContext("2d", { alpha: false }); canvasContext = canvas.getContext("2d", { alpha: false });
this.#canvasContexts.set(lang, canvasContext);
} }
return this.#canvasCtx; return canvasContext;
} }
static #getAscent(fontFamily, lang) { static #getAscent(fontFamily, lang) {

View file

@ -0,0 +1 @@
https://github.com/mozilla/pdf.js/files/12366234/16_2020-044.pdf

View file

@ -2202,6 +2202,15 @@
"lastPage": 1, "lastPage": 1,
"type": "eq" "type": "eq"
}, },
{
"id": "issue16843-text",
"file": "pdfs/issue16843.pdf",
"md5": "2845b2f7f02690c388c24c488297028a",
"rounds": 1,
"link": true,
"lastPage": 1,
"type": "text"
},
{ {
"id": "issue5509", "id": "issue5509",
"file": "pdfs/issue5509.pdf", "file": "pdfs/issue5509.pdf",