Extend JPEG XL detection/recognition from Waterfox

Author: K4sum1

Cargo.lock

@@ -219,6 +219,9 @@ webext-storage = { git = "https://github.com/mozilla/application-services", rev
 # Patch mio 0.8.8 to use windows-sys 0.52 (backport https://github.com/tokio-rs/mio/commit/eea9e3e0c469480e5c59c01e6c3c7e5fd88f0848)
 mio_0_8 = { package = "mio", git = "https://github.com/glandium/mio", rev = "9a2ef335c366044ffe73b1c4acabe50a1daefe05" }
 
+# add unmerged mime types
+mime_guess = { path = "third_party/rust/mime_guess" }
+
 # Patch mio 0.6 to use winapi 0.3 and miow 0.3, getting rid of winapi 0.2.
 # There is not going to be new version of mio 0.6, mio now being >= 0.7.11.
 [patch.crates-io.mio]

Cargo.toml

@@ -1194,6 +1194,7 @@ function maybeRecordToHandleTelemetry(uri, isLaunch) {
       ".xhtml",
       ".svg",
       ".webp",
+      ".jxl",
     ]);
     if (registeredExtensions.has(extension)) {
       Services.telemetry.keyedScalarAdd(scalar, extension, 1);

browser/components/BrowserContentHandler.sys.mjs

@@ -66,6 +66,7 @@
               <uap:FileType>.xhtml</uap:FileType>
               <uap:FileType>.svg</uap:FileType>
               <uap:FileType>.webp</uap:FileType>
+              <uap:FileType>.jxl</uap:FileType>
             </uap:SupportedFileTypes>
             <uap:Logo>Assets\Document44x44.png</uap:Logo>
             <uap2:SupportedVerbs>

browser/installer/windows/msix/AppxManifest.xml.in

@@ -544,6 +544,7 @@ ${RemoveDefaultBrowserAgentShortcut}
   ${AddAssociationIfNoneExist} ".svg" "FirefoxHTML$5"
   ${AddAssociationIfNoneExist} ".webp"  "FirefoxHTML$5"
   ${AddAssociationIfNoneExist} ".avif" "FirefoxHTML$5"
+  ${AddAssociationIfNoneExist} ".jxl" "WaterfoxHTML$5"
 
   ${AddAssociationIfNoneExist} ".pdf" "FirefoxPDF$5"
 

browser/installer/windows/nsis/shared.nsh

@@ -486,6 +486,7 @@ Section "Uninstall"
   ${un.RegCleanFileHandler}  ".svg"   "FirefoxHTML-$AppUserModelID"
   ${un.RegCleanFileHandler}  ".webp"  "FirefoxHTML-$AppUserModelID"
   ${un.RegCleanFileHandler}  ".avif"  "FirefoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".jxl"   "WaterfoxHTML-$AppUserModelID"
 
   ${un.RegCleanFileHandler}  ".pdf"   "FirefoxPDF-$AppUserModelID"
 

browser/installer/windows/nsis/uninstaller.nsi

@@ -567,6 +567,7 @@ pub static MIME_TYPES: &[(&str, &[&str])] = &[
     ("jsonml", &["application/jsonml+json"]),
     ("jsx", &["text/jscript"]),
     ("jsxbin", &["text/plain"]),
+    ("jxl", &["image/jxl"]),
     ("kar", &["audio/midi"]),
     ("karbon", &["application/vnd.kde.karbon"]),
     ("kfo", &["application/vnd.kde.kformula"]),

third_party/rust/mime_guess/src/mime_types.rs

@@ -50,6 +50,7 @@ const FILE_EXTENSIONS = [
   "jpg",
   "jpeg",
   "json",
+  "jxl",
   "m4a",
   "mdb",
   "mid",

toolkit/components/downloads/DownloadList.sys.mjs

@@ -104,6 +104,8 @@ const FILTER_IMAGES_EXTENSIONS = [
   "raw",
   "webp",
   "heic",
+  "avif",
+  "jxl",
 ];
 
 const FILTER_XML_EXTENSIONS = ["xml"];

toolkit/components/extensions/parent/ext-downloads.js

@@ -5,7 +5,7 @@
 allFilter=*
 htmlFilter=*.html; *.htm; *.shtml; *.xhtml
 textFilter=*.txt; *.text
-imageFilter=*.jpe; *.jpg; *.jpeg; *.gif; *.png; *.bmp; *.ico; *.svg; *.svgz; *.tif; *.tiff; *.ai; *.drw; *.pct; *.psp; *.xcf; *.psd; *.raw; *.webp; *.heic
+imageFilter=*.jpe; *.jpg; *.jpeg; *.gif; *.png; *.bmp; *.ico; *.svg; *.svgz; *.tif; *.tiff; *.ai; *.drw; *.pct; *.psp; *.xcf; *.psd; *.raw; *.webp; *.heic; *.avif; *.jxl
 xmlFilter=*.xml
 xulFilter=*.xul
 audioFilter=*.aac; *.aif; *.flac; *.iff; *.m4a; *.m4b; *.mid; *.midi; *.mp3; *.mpa; *.mpc; *.oga; *.ogg; *.opus; *.ra; *.ram; *.snd; *.wav; *.wma

toolkit/content/filepicker.properties

@@ -419,7 +419,8 @@ nsresult nsAppShell::Init() {
     gchar* name = gdk_pixbuf_format_get_name(format);
     if (strcmp(name, "jpeg") && strcmp(name, "png") && strcmp(name, "gif") &&
         strcmp(name, "bmp") && strcmp(name, "ico") && strcmp(name, "xpm") &&
-        strcmp(name, "svg") && strcmp(name, "webp") && strcmp(name, "avif")) {
+        strcmp(name, "svg") && strcmp(name, "webp") && strcmp(name, "avif") &&
+        strcmp(name, "jxl")) {
       gdk_pixbuf_format_set_disabled(format, TRUE);
     }
     g_free(name);