commit 7d114e93d25ccc697352643d55edd89106f4d4e0 parent dc10e26ff5f635ef1a116b60f8dbd2e628891646 Author: Tom Schuster <tschuster@mozilla.com> Date: Thu, 20 Nov 2025 11:16:16 +0000 Bug 2000196 - In browser_multiple_ico.js allow both encodings for the ICO file. r=tnikkel Differential Revision: https://phabricator.services.mozilla.com/D273188 Diffstat:
| M | browser/base/content/test/favicons/browser_multiple_ico.js | | | 5 | ++++- |
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/browser/base/content/test/favicons/browser_multiple_ico.js b/browser/base/content/test/favicons/browser_multiple_ico.js @@ -8,7 +8,10 @@ const PAGE_URL = TEST_ROOT + "file_multiple_ico.html"; // An ICO file with three BMP images const ICO_WITH_BMP_URL = TEST_ROOT + "file_multiple.ico"; // An ICO file with three PNG images (with the same colors/sizes as the file above) -const ICO_WITH_PNG_DATA_URL = `data:image/x-icon;base64,AAABAAMAAAAAAAEAIABNAAAANgAAAAAAAAABACAATAAAAIMAAAAAAAAAAQAgAEwAAADPAAAAiVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFElEQVQIW2NkYPj/n4GBgYERxgAAKAUD/zojOmwAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAAABAAAAAQIBgAAAKnxnn4AAAATSURBVAhbY2T4z/ifAQkwki4AADxfCAHpZAkkAAAAAElFTkSuQmCCiVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAE0lEQVQYV2P8x8DwnwEPYBwZCgAYdw/xpf5XXwAAAABJRU5ErkJggg==`; +// The encoding differs slightly depending on the zlib implementation. +const ICO_WITH_PNG_DATA_URL = AppConstants.USE_LIBZ_RS + ? `data:image/x-icon;base64,AAABAAMAAAAAAAEAIABNAAAANgAAAAAAAAABACAATAAAAIMAAAAAAAAAAQAgAEwAAADPAAAAiVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFElEQVQIW2NkYPj/n4GBgYERxgAAKAUD/zojOmwAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAAABAAAAAQIBgAAAKnxnn4AAAATSURBVAhbY2T4z/ifAQkwki4AADxfCAHpZAkkAAAAAElFTkSuQmCCiVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAE0lEQVQYV2P8x8DwnwEPYBwZCgAYdw/xpf5XXwAAAABJRU5ErkJggg==` + : `data:image/x-icon;base64,AAABAAMAAAAAAAEAIABLAAAANgAAAAAAAAABACAATAAAAIEAAAAAAAAAAQAgAEwAAADNAAAAiVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAEklEQVQIW2NkYPj/nwEIGGEMACgFA/+JPWuRAAAAAElFTkSuQmCCiVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAE0lEQVQIW2Nk+M/4nwEJMJIuAAA8XwgB6WQJJAAAAABJRU5ErkJggolQTkcNChoKAAAADUlIRFIAAAAIAAAACAgGAAAAxA++iwAAABNJREFUGFdj/MfA8J8BD2AcGQoAGHcP8aX+V18AAAAASUVORK5CYII=`; add_task(async function () { await BrowserTestUtils.withNewTab(