diff --git a/src/display/api.js b/src/display/api.js index e449ea319..a0b2156c9 100644 --- a/src/display/api.js +++ b/src/display/api.js @@ -2281,7 +2281,6 @@ class WorkerTransport { this.loadingTask = loadingTask; this.commonObjs = new PDFObjects(); this.fontLoader = new FontLoader({ - docId: loadingTask.docId, onUnsupportedFeature: this._onUnsupportedFeature.bind(this), ownerDocument: params.ownerDocument, styleElement: params.styleElement, diff --git a/src/display/font_loader.js b/src/display/font_loader.js index 185e42585..5cb508da7 100644 --- a/src/display/font_loader.js +++ b/src/display/font_loader.js @@ -25,12 +25,10 @@ import { class FontLoader { constructor({ - docId, onUnsupportedFeature, ownerDocument = globalThis.document, styleElement = null, // For testing only. }) { - this.docId = docId; this._onUnsupportedFeature = onUnsupportedFeature; this._document = ownerDocument; @@ -52,15 +50,13 @@ class FontLoader { } insertRule(rule) { - let styleElement = this.styleElement; - if (!styleElement) { - styleElement = this.styleElement = this._document.createElement("style"); - styleElement.id = `PDFJS_FONT_STYLE_TAG_${this.docId}`; + if (!this.styleElement) { + this.styleElement = this._document.createElement("style"); this._document.documentElement .getElementsByTagName("head")[0] - .append(styleElement); + .append(this.styleElement); } - const styleSheet = styleElement.sheet; + const styleSheet = this.styleElement.sheet; styleSheet.insertRule(rule, styleSheet.cssRules.length); } diff --git a/test/unit/custom_spec.js b/test/unit/custom_spec.js index a0773c369..ae33736ec 100644 --- a/test/unit/custom_spec.js +++ b/test/unit/custom_spec.js @@ -172,7 +172,7 @@ describe("custom ownerDocument", function () { expect(style).toBeFalsy(); expect(ownerDocument.fonts.size).toBeGreaterThanOrEqual(1); expect(Array.from(ownerDocument.fonts).find(checkFont)).toBeTruthy(); - await doc.destroy(); + await loadingTask.destroy(); CanvasFactory.destroy(canvasAndCtx); expect(ownerDocument.fonts.size).toBe(0); @@ -204,7 +204,7 @@ describe("custom ownerDocument", function () { const style = elements.find(element => element.tagName === "style"); expect(style.sheet.cssRules.length).toBeGreaterThanOrEqual(1); expect(style.sheet.cssRules.find(checkFontFaceRule)).toBeTruthy(); - await doc.destroy(); + await loadingTask.destroy(); CanvasFactory.destroy(canvasAndCtx); expect(style.remove.called).toBe(true);