Merge branch 'bookmarks/esr102' of hg://hg.mozilla.org/mozilla-unifie…

…d into esr102
Floorp-Projects · Jun 21, 2022 · cb53f7e · cb53f7e
2 parents 159d9fe + c0022de
commit cb53f7e
Show file tree

Hide file tree

Showing 38 changed files with 1,422 additions and 59 deletions.
diff --git a/.hgtags b/.hgtags
diff --git a/CLOBBER b/CLOBBER
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Merge day clobber 2022-05-30
+Merge day clobber 2022-06-20
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/browser/app/autoconfig/autoconfig.js b/browser/app/autoconfig/autoconfig.js
@@ -1,10 +1,10 @@
 //This config file is made by xiaoxiaoflood. Thanks. Pelase read about:license. 
 
-const { XPIDatabase } = Cu.import('resource://gre/modules/addons/XPIDatabase.jsm');
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-XPIDatabase.SIGNED_TYPES.delete('extension');
 
 if (Services.prefs.getBoolPref("toolkit.legacyUserProfileCustomizations.script", false)) {
+const { XPIDatabase } = Cu.import('resource://gre/modules/addons/XPIDatabase.jsm');
+XPIDatabase.SIGNED_TYPES.delete('extension');
 try {
   let cmanifest = Cc['@mozilla.org/file/directory_service;1'].getService(Ci.nsIProperties).get('UChrm', Ci.nsIFile);
   cmanifest.append('utils');

diff --git a/browser/components/search/extensions/ecosia/favicon.ico b/browser/components/search/extensions/ecosia/favicon.ico
diff --git a/browser/components/search/extensions/ecosia/manifest.json b/browser/components/search/extensions/ecosia/manifest.json
@@ -2,7 +2,7 @@
   "name": "Ecosia",
   "description": "Search Ecosia",
   "manifest_version": 2,
-  "version": "1.0",
+  "version": "1.1",
   "applications": {
     "gecko": {
       "id": "[email protected]"

diff --git a/browser/locales/l10n-changesets.json b/browser/locales/l10n-changesets.json
@@ -321,7 +321,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "2ec7f35b8135c973be38e29ae2743dd1c94756d0"
+        "revision": "5254c6983528355bee70d3f2a770aaa22b0a44b3"
     },
     "dsb": {
         "pin": false,
@@ -357,7 +357,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "61179e0f4dd8d22bf304032fc896392d46b895dd"
+        "revision": "c82f4aeaaebf6d0e189b511f5843a3afd8c85591"
     },
     "en-CA": {
         "pin": false,
@@ -411,7 +411,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "48df63579b8d3b03470310ced4df2aec832f3c77"
+        "revision": "bb27864950c776e16b70e23c5dba62e22d52be52"
     },
     "es-AR": {
         "pin": false,
@@ -483,7 +483,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "aafc2865a803839848d86a519056cac921133dbf"
+        "revision": "d474cafda35e3918b23d74ee7cef1a554f54afde"
     },
     "et": {
         "pin": false,
@@ -591,7 +591,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1264fb97a2c787f148a25dbf75156271b1f704ea"
+        "revision": "739d235548164ab87d4cce8c971b7b674f08fc84"
     },
     "fy-NL": {
         "pin": false,
@@ -861,7 +861,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "487b748d33d011b6a94219b773c4ef56a6aa4354"
+        "revision": "af7a2e89ef8f98d33b9212aa59dc3acc53f9728c"
     },
     "it": {
         "pin": false,
@@ -879,7 +879,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "19c1d7eadd4a6e46cfb2dddf084ec6eb37dfaafd"
+        "revision": "f24c6544b272b4131cdaaab6caefdf3921020136"
     },
     "ja": {
         "pin": false,
@@ -895,15 +895,15 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "127b08d3a6932702264d1b5d42f78e481115d60d"
+        "revision": "a393cc63e494f30a4c212c729e178a4ab7356a0e"
     },
     "ja-JP-mac": {
         "pin": false,
         "platforms": [
             "macosx64",
             "macosx64-devedition"
         ],
-        "revision": "b51d96b3c0e8cd5de1b58c44c6553f719acfa4c3"
+        "revision": "16f40bb8f3d731746b39157a30a4b40c73ce1227"
     },
     "ka": {
         "pin": false,
@@ -921,7 +921,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "03f6d4681aeab2f3081e6170ed5a96721d2643f2"
+        "revision": "2cea74990aa1b26e53b620818f7a0ff20afb0f50"
     },
     "kab": {
         "pin": false,
@@ -957,7 +957,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "19ce39fd7fb2fe20f6624e73bb022cc633c5a882"
+        "revision": "d8858f1bc7528b0daa7ecc63164c899c669b5c31"
     },
     "km": {
         "pin": false,
@@ -1083,7 +1083,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "ecc8e0437584ca8132afdf2a5192b7209dba5f38"
+        "revision": "cebf57040c92193a3c0a9823726d30db61382c49"
     },
     "mr": {
         "pin": false,
@@ -1227,7 +1227,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "c29b1750e0d47ea8936507146431b0425a2083ce"
+        "revision": "fcef596602cc933df1ba8233d2485adb678b4421"
     },
     "pa-IN": {
         "pin": false,
@@ -1245,7 +1245,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "fe2d7c2cd1e6ddd23225e8e9eddbf854a4e6391b"
+        "revision": "798afc28472d0aa623b7d6ee1d35dccb42f4d1b1"
     },
     "pl": {
         "pin": false,
@@ -1263,7 +1263,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "8ff6f15ae4c24311f60ad3a108cca7abd443fd5b"
+        "revision": "36007fca7dee43f4930c7d4bcc67af3edbd4d377"
     },
     "pt-BR": {
         "pin": false,
@@ -1281,7 +1281,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9880b363b8926035debd1b7e67b27d1509386721"
+        "revision": "0d4ca05301c9013e32d7f299b84fbe2dd33d4836"
     },
     "pt-PT": {
         "pin": false,
@@ -1299,7 +1299,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "012095d45e7dfedde3f2ae924005db743bec4926"
+        "revision": "6c0a2f5dda9f7c139650c268d8ea3a7c58287484"
     },
     "rm": {
         "pin": false,
@@ -1425,7 +1425,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1f32442d275b3235c8223922e3c06b35d3487ff7"
+        "revision": "a60ba38789291bb9206601efa756510322025549"
     },
     "son": {
         "pin": false,
@@ -1569,7 +1569,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1af51f1f890cd94aed334bd335f5dfac56076c56"
+        "revision": "4d19b047cf19ac1af16d9cf2c53e9c5976c5c039"
     },
     "tl": {
         "pin": false,
@@ -1641,7 +1641,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "20edc33f765a76bd443a66d50066543dd5a8b8a2"
+        "revision": "523eef823549df8bc48d969e0ede7682c64ead48"
     },
     "ur": {
         "pin": false,

diff --git a/dom/ipc/BrowserChild.cpp b/dom/ipc/BrowserChild.cpp
@@ -1206,6 +1206,7 @@ mozilla::ipc::IPCResult BrowserChild::RecvInitRendering(
     const layers::LayersId& aLayersId,
     const CompositorOptions& aCompositorOptions, const bool& aLayersConnected) {
   mLayersConnected = Some(aLayersConnected);
+  mLayersConnectRequested = Some(aLayersConnected);
   InitRenderingState(aTextureFactoryIdentifier, aLayersId, aCompositorOptions);
   return IPC_OK();
 }
@@ -3141,7 +3142,8 @@ void BrowserChild::ReinitRendering() {
 
   // In some cases, like when we create a windowless browser,
   // RemoteLayerTreeOwner/BrowserChild is not connected to a compositor.
-  if (mLayersConnected.isNothing() || !*mLayersConnected) {
+  if (mLayersConnectRequested.isNothing() ||
+      mLayersConnectRequested == Some(false)) {
     return;
   }
 

diff --git a/dom/ipc/BrowserChild.h b/dom/ipc/BrowserChild.h
@@ -801,6 +801,7 @@ class BrowserChild final : public nsMessageManagerScriptExecutor,
   layers::LayersId mLayersId;
   CSSRect mUnscaledOuterRect;
   Maybe<bool> mLayersConnected;
+  Maybe<bool> mLayersConnectRequested;
   EffectsInfo mEffectsInfo;
 
   RefPtr<VsyncMainChild> mVsyncChild;

diff --git a/dom/security/test/general/browser_file_nonscript.js b/dom/security/test/general/browser_file_nonscript.js
@@ -4,6 +4,10 @@
 "use strict";
 
 add_task(async function test_fileurl_nonscript_load() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["security.block_fileuri_script_with_wrong_mime", true]],
+  });
+
   let file = getChromeDir(getResolvedURI(gTestPath));
   file.append("file_loads_nonscript.html");
   let uriString = Services.io.newFileURI(file).spec;

diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
@@ -12081,7 +12081,7 @@
 # (OS) mapping when loaded via the file:// protocol.
 - name: security.block_fileuri_script_with_wrong_mime
   type: bool
-  value: true
+  value: @IS_EARLY_BETA_OR_EARLIER@
   mirror: always
 
 # Cancel outgoing requests from SystemPrincipal:

diff --git a/netwerk/dns/TRRService.cpp b/netwerk/dns/TRRService.cpp
@@ -1018,10 +1018,8 @@ TRRService::ConfirmationContext::Notify(nsITimer* aTimer) {
   MutexSingleWriterAutoLock lock(OwningObject()->mLock);
   if (aTimer == mTimer) {
     HandleEvent(ConfirmationEvent::Retry, lock);
-    return NS_OK;
   }
 
-  MOZ_CRASH("Unknown timer");
   return NS_OK;
 }
 

diff --git a/security/sandbox/common/SandboxSettings.cpp b/security/sandbox/common/SandboxSettings.cpp
@@ -79,6 +79,11 @@ const char* ContentWin32kLockdownStateToString(
 
     case nsIXULRuntime::ContentWin32kLockdownState::EnabledByDefault:
       return "Win32k Lockdown enabled -- default value is true";
+
+    case nsIXULRuntime::ContentWin32kLockdownState::
+        IncompatibleMitigationPolicy:
+      return "Win32k Lockdown disabled -- Incompatible Windows Exploit "
+             "Protection policies enabled";
   }
 
   MOZ_CRASH("Should never reach here");

diff --git a/security/sandbox/common/test/SandboxTestingChildTests.h b/security/sandbox/common/test/SandboxTestingChildTests.h
@@ -602,18 +602,8 @@ void RunTestsRDD(SandboxTestingChild* child) {
   child->ErrnoTest("socket_inet"_ns, false,
                    [] { return socket(AF_INET, SOCK_STREAM, 0); });
 
-  {
-    UniqueFileHandle fd(socket(AF_UNIX, SOCK_STREAM, 0));
-    child->ErrnoTest("socket_unix"_ns, true, [&] { return fd.get(); });
-
-    struct sockaddr_un sun {};
-    sun.sun_family = AF_UNIX;
-    strncpy(sun.sun_path, "/tmp/forbidden-sock", sizeof(sun.sun_path));
-
-    child->ErrnoValueTest("socket_unix_bind"_ns, ENOSYS, [&] {
-      return bind(fd.get(), (struct sockaddr*)&sun, sizeof(sun));
-    });
-  }
+  child->ErrnoTest("socket_unix"_ns, false,
+                   [] { return socket(AF_UNIX, SOCK_STREAM, 0); });
 
   child->ErrnoTest("uname"_ns, true, [] {
     struct utsname uts;

diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp
@@ -1790,7 +1790,6 @@ class RDDSandboxPolicy final : public SandboxPolicyCommon {
   explicit RDDSandboxPolicy(SandboxBrokerClient* aBroker) {
     mBroker = aBroker;
     mMayCreateShmem = true;
-    mBrokeredConnect = true;
   }
 
 #ifndef ANDROID

diff --git a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
@@ -382,7 +382,8 @@ static void AddGLDependencies(SandboxBroker::Policy* policy) {
   // cache, because the details can vary by process type, including
   // whether caching is enabled.
 
-  AddX11Dependencies(policy);
+  // This also doesn't include permissions for connecting to a display
+  // server, because headless GL (e.g., Mesa GBM) may not need it.
 }
 
 void SandboxBrokerPolicyFactory::InitContentPolicy() {
@@ -399,6 +400,7 @@ void SandboxBrokerPolicyFactory::InitContentPolicy() {
 
   if (!headless) {
     AddGLDependencies(policy);
+    AddX11Dependencies(policy);
   }
 
   // Read permissions
@@ -855,7 +857,8 @@ SandboxBrokerPolicyFactory::GetRDDPolicy(int aPid) {
     }
   }
 
-  // VA-API needs GPU access and GL context creation
+  // VA-API needs GPU access and GL context creation (but not display
+  // server access, as of bug 1769499).
   AddGLDependencies(policy.get());
 
   // FFmpeg and GPU drivers may need general-case library loading

diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
@@ -360,9 +360,7 @@ merge-automation:
                   new-suffix: 'esr'
             replacements: []
             merge-old-head: false
-            base-tag: "FIREFOX_ESR_{major_version}_BASE"
-            from-repo: 'https://hg.mozilla.org/releases/mozilla-release'
-            from-branch: 'release'
+            end-tag: "FIREFOX_ESR_{major_version}_BASE"
             to-repo: 'https://hg.mozilla.org/releases/mozilla-esr102'
             to-branch: 'esr102'
         bump-central:

diff --git a/toolkit/components/featuregates/FeatureGate.jsm b/toolkit/components/featuregates/FeatureGate.jsm
@@ -237,6 +237,7 @@ class FeatureGate {
     ["mac", AppConstants.platform === "macosx"],
     ["linux", AppConstants.platform === "linux"],
     ["android", AppConstants.platform === "android"],
+    ["thunderbird", AppConstants.MOZ_APP_NAME === "thunderbird"],
   ]);
 
   /**

diff --git a/toolkit/components/featuregates/Features.toml b/toolkit/components/featuregates/Features.toml
@@ -7,7 +7,7 @@ preference = "layout.css.grid-template-masonry-value.enabled"
 type = "boolean"
 bug-numbers = [1607954]
 is-public = true
-default-value = {default = false, nightly = true}
+default-value = {default = false, nightly = true, thunderbird = true}
 
 [web-api-webgpu]
 title = "experimental-features-web-gpu2"

diff --git a/toolkit/components/featuregates/gen_feature_definitions.py b/toolkit/components/featuregates/gen_feature_definitions.py
@@ -193,6 +193,7 @@ def process_configured_value(name, value):
             "release",
             "dev-edition",
             "esr",
+            "thunderbird",
         }
     )