Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 27 insertions, 2 deletions

diff --git a/netwerk/mime/nsIMIMEInfo.idl b/netwerk/mime/nsIMIMEInfo.idl
index a7ffcfe513..97d7660932 100644
--- a/netwerk/mime/nsIMIMEInfo.idl
+++ b/netwerk/mime/nsIMIMEInfo.idl
@@ -53,19 +53,24 @@ interface nsIHandlerInfo : nsISupports {
     readonly attribute nsIMutableArray possibleApplicationHandlers;
 
     /**
-     * Indicates whether a default application handler exists,
+     * Indicates whether a default OS application handler exists,
      * i.e. whether launchWithFile with action = useSystemDefault is possible
      * and defaultDescription will contain usable information.
      */
     readonly attribute boolean hasDefaultHandler;
 
     /**
-     * A pretty name description of the associated default application. Only
+     * A pretty name description of the associated default OS application. Only
      * usable if hasDefaultHandler is true.
      */
     readonly attribute AString defaultDescription;
 
     /**
+     * The default OS application. Only usable if hasDefaultHandler is true.
+     */
+    readonly attribute nsIFile defaultExecutable;
+
+    /**
      * Launches the application with the specified URI, in a way that
      * depends on the value of preferredAction. preferredAction must be
      * useHelperApp or useSystemDefault.
@@ -281,6 +286,24 @@ interface nsILocalHandlerApp : nsIHandlerApp {
     readonly attribute unsigned long parameterCount;
 
     /**
+     * Asynchronously returns the pretty (user friendly) name of the
+     * executable.
+     *
+     * On Linux and Mac, this is the same as the name
+     * property. On Mac, that happens to be a nicer name than
+     * the executable's name without the file extension.
+     *
+     * On Windows, this name will be nicer, looked up from the
+     * registry when it exists and falling back to the FileDescription
+     * getVersionFieldInfo when the registry data doesn't exist.
+     * This has the side effect that the prettyName returned
+     * generally will match the text returned by defaultDescription in
+     * nsIHandlerInfo.
+     */
+    [implicit_jscontext]
+    Promise prettyNameAsync();
+
+    /**
      * Clears the current list of command line parameters.
      */
     void clearParameters();
diff --git a/netwerk/mime/nsMimeTypes.h b/netwerk/mime/nsMimeTypes.h
index 86934d44fd..66034c7b2c 100644
--- a/netwerk/mime/nsMimeTypes.h
+++ b/netwerk/mime/nsMimeTypes.h
@@ -31,6 +31,7 @@
 #define APPLICATION_GZIP2 "application/gzip"
 #define APPLICATION_GZIP3 "application/x-gunzip"
 #define APPLICATION_BROTLI "application/brotli"
+#define APPLICATION_ZSTD "application/zstd"
 #define APPLICATION_ZIP "application/zip"
 #define APPLICATION_HTTP_INDEX_FORMAT "application/http-index-format"
 #define APPLICATION_ECMASCRIPT "application/ecmascript"
@@ -245,6 +246,7 @@
 #define ENCODING_UUENCODE3 "uuencode"
 #define ENCODING_UUENCODE4 "uue"
 #define ENCODING_YENCODE "x-yencode"
+#define ENCODING_ZSTD "zstd"
 
 /* Some names of parameters that various MIME headers include.
  */