Merge pull request #18430 from Snuffleupagus/pr-18417-followup

Fix `DOMFilterFactory.#createUrl` in MOZCENTRAL builds (18417 PR follow-up)
This commit is contained in:
Jonas Jenwald 2024-07-15 15:05:35 +02:00 committed by GitHub
commit f9e3b6bcc4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -124,22 +124,20 @@ class DOMFilterFactory extends BaseFilterFactory {
} }
#createUrl(id) { #createUrl(id) {
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
if (this.#baseUrl === undefined) { if (this.#baseUrl === undefined) {
// Unless a `<base>`-element is present a relative URL should work.
this.#baseUrl = "";
const url = this.#document.URL; const url = this.#document.URL;
if (url === this.#document.baseURI) { if (url !== this.#document.baseURI) {
// No `<base>`-element present, hence a relative URL should work. if (isDataScheme(url)) {
this.#baseUrl = "";
} else if (isDataScheme(url)) {
warn('#createUrl: ignore "data:"-URL for performance reasons.'); warn('#createUrl: ignore "data:"-URL for performance reasons.');
this.#baseUrl = "";
} else { } else {
this.#baseUrl = url.split("#", 1)[0]; this.#baseUrl = url.split("#", 1)[0];
} }
} }
return `url(${this.#baseUrl}#${id})`;
} }
return `url(${id})`; return `url(${this.#baseUrl}#${id})`;
} }
addFilter(maps) { addFilter(maps) {