+- 
+-
++ ${src &&
++ html`
++
++
++
++ `}
+
+ ${this.showCustomNetErrorCard
+ ? html`${this.customNetErrorContainerTemplate()}`
+diff --git a/toolkit/themes/shared/aboutNetError.css b/toolkit/themes/shared/aboutNetError.css
+index f1a707b988..658d3f34d3 100644
+--- a/toolkit/themes/shared/aboutNetError.css
++++ b/toolkit/themes/shared/aboutNetError.css
+@@ -208,7 +208,7 @@
+ }
+
+ .img-container > img {
+- width: 8.75em;
++ width: 3.5em;
+ margin-block-start: 2em;
+ margin-inline-end: 2.5em;
+ }
+diff --git a/toolkit/themes/shared/illustrations/warning.svg b/toolkit/themes/shared/illustrations/warning.svg
+new file mode 100644
+index 0000000000..e93301c810
+--- /dev/null
++++ b/toolkit/themes/shared/illustrations/warning.svg
+@@ -0,0 +1,8 @@
++
++
diff --git a/patches/pack_vs.py b/patches/android/pack_vs-esr.py
similarity index 100%
rename from patches/pack_vs.py
rename to patches/android/pack_vs-esr.py
diff --git a/patches/android/remove-openai-esr.patch b/patches/android/remove-openai-esr.patch
new file mode 100644
index 000000000..78b1f5974
--- /dev/null
+++ b/patches/android/remove-openai-esr.patch
@@ -0,0 +1,146 @@
+From 8ca2d1361a3f0a36f71b7e692319b800cf5c11c8 Mon Sep 17 00:00:00 2001
+From: celenity
+Date: Wed, 4 Feb 2026 04:27:07 +0000
+Subject: [PATCH] fix: Remove OpenAI backend
+
+Removes the OpenAI backend from Mozilla's ML (machine learning) component.
+
+Signed-off-by: celenity
+
+LibreWolf note: this patch is only half of the removal. It comments out every
+*reference* to the OpenAI backend; the two paths themselves,
+
+ toolkit/components/ml/content/backends/OpenAIPipeline.mjs
+ toolkit/components/ml/vendor/openai/
+
+are deleted by delete_from_tree() in scripts/librewolf-patches.py, because a
+unified diff would have to carry all ~340KB of the vendored SDK to express that
+- the very code this patch exists to get rid of. The jar.mn and license.html
+hunks below name both paths verbatim, so an upstream rename rejects here and
+`make check-patchfail` catches it. Do not relax that context: it is the
+tripwire for the deletions. See landmine L4 in docs/android/AGENTS.md.
+
+Both hunks also cover the NIGHTLY_BUILD-only reference to
+vendor/openai/dist/openai-dev.mjs (jar.mn, license.html). The preprocessor
+drops it on release and beta, so leaving it alone was harmless there, but a
+nightly-channel build reaches it and would fail packaging on a file
+delete_from_tree() has already removed. Commenting it out costs nothing on
+release and extends the rename tripwire to the -dev path.
+
+The jar.mn hunk used to apply with fuzz 2: its trailing context ran on into
+`#ifdef NIGHTLY_BUILD`, and upstream has since inserted the
+content/global/ml/security/* entries in between. It is now two hunks whose
+context is what the 153.0.4 tree actually contains, so it applies at fuzz 0.
+That is a context correction, not a loosening - every `-` line still names an
+OpenAI path in full, which is the part that has to reject on a rename.
+---
+ toolkit/components/aboutinference/content/aboutInference.js | 4 ++--
+ toolkit/components/ml/content/EngineProcess.sys.mjs | 2 +-
+ toolkit/components/ml/content/backends/Pipeline.mjs | 6 +++---
+ toolkit/components/ml/jar.mn | 6 +++---
+ toolkit/content/license.html | 4 ++--
+ 5 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/toolkit/components/aboutinference/content/aboutInference.js b/toolkit/components/aboutinference/content/aboutInference.js
+index 01533ad4c9f2..041bdcaeaeaf 100644
+--- a/toolkit/components/aboutinference/content/aboutInference.js
++++ b/toolkit/components/aboutinference/content/aboutInference.js
+@@ -381,7 +381,7 @@ const INFERENCE_PAD_PRESETS = {
+ device: "cpu",
+ backend: "onnx",
+ },
+- openai: {
++/* openai: {
+ inputArgs: [
+ {
+ role: "system",
+@@ -400,7 +400,7 @@ const INFERENCE_PAD_PRESETS = {
+ apiKey: "ollama",
+ baseURL: "http://localhost:11434/v1",
+ backend: "openai",
+- },
++ }, */
+ };
+
+ const PREDEFINED = Object.keys(INFERENCE_PAD_PRESETS);
+diff --git a/toolkit/components/ml/content/EngineProcess.sys.mjs b/toolkit/components/ml/content/EngineProcess.sys.mjs
+index 025d5aa..8007123 100644
+--- a/toolkit/components/ml/content/EngineProcess.sys.mjs
++++ b/toolkit/components/ml/content/EngineProcess.sys.mjs
+@@ -27,7 +27,7 @@ export const BACKENDS = Object.freeze({
+ llamaCpp: "llama.cpp",
+ bestLlama: "best-llama",
+ bestOnnx: "best-onnx",
+- openai: "openai",
++// openai: "openai",
+ staticEmbeddings: "static-embeddings",
+ });
+
+diff --git a/toolkit/components/ml/content/backends/Pipeline.mjs b/toolkit/components/ml/content/backends/Pipeline.mjs
+index a4b997e9bc4d..4565f3e097be 100644
+--- a/toolkit/components/ml/content/backends/Pipeline.mjs
++++ b/toolkit/components/ml/content/backends/Pipeline.mjs
+@@ -12,7 +12,7 @@ ChromeUtils.defineESModuleGetters(
+ LlamaCppPipeline:
+ "chrome://global/content/ml/backends/LlamaCppPipeline.mjs",
+ PipelineOptions: "chrome://global/content/ml/EngineProcess.sys.mjs",
+- OpenAIPipeline: "chrome://global/content/ml/backends/OpenAIPipeline.mjs",
++// OpenAIPipeline: "chrome://global/content/ml/backends/OpenAIPipeline.mjs",
+ StaticEmbeddingsPipeline:
+ "chrome://global/content/ml/backends/StaticEmbeddingsPipeline.mjs",
+ },
+@@ -48,9 +48,9 @@ export async function getBackend(consumer, wasm, options) {
+ case "llama.cpp":
+ factory = lazy.LlamaCppPipeline.initialize;
+ break;
+- case "openai":
++/* case "openai":
+ factory = lazy.OpenAIPipeline.initialize;
+- break;
++ break; */
+ case "static-embeddings":
+ factory = lazy.StaticEmbeddingsPipeline.initialize;
+ break;
+diff --git a/toolkit/components/ml/jar.mn b/toolkit/components/ml/jar.mn
+index 7dbb7c5afc7b..b2f07fd5bdcf 100644
+--- a/toolkit/components/ml/jar.mn
++++ b/toolkit/components/ml/jar.mn
+@@ -25,9 +25,9 @@ toolkit.jar:
+ content/global/ml/backends/LlamaPipeline.mjs (content/backends/LlamaPipeline.mjs)
+ content/global/ml/ThomSample.mjs (content/ThomSample.mjs)
+ content/global/ml/backends/LlamaCppPipeline.mjs (content/backends/LlamaCppPipeline.mjs)
+- content/global/ml/backends/OpenAIPipeline.mjs (content/backends/OpenAIPipeline.mjs)
++# content/global/ml/backends/OpenAIPipeline.mjs (content/backends/OpenAIPipeline.mjs)
+ content/global/ml/backends/StaticEmbeddingsPipeline.mjs (content/backends/StaticEmbeddingsPipeline.mjs)
+- content/global/ml/openai.mjs (vendor/openai/dist/openai.mjs)
++# content/global/ml/openai.mjs (vendor/openai/dist/openai.mjs)
+ content/global/ml/MLTelemetry.sys.mjs (MLTelemetry.sys.mjs)
+ content/global/ml/security/ConditionEvaluator.sys.mjs (security/ConditionEvaluator.sys.mjs)
+ content/global/ml/security/DecisionTypes.sys.mjs (security/DecisionTypes.sys.mjs)
+@@ -40,5 +40,5 @@ toolkit.jar:
+ content/global/ml/ort.webgpu-dev.mjs (vendor/ort.webgpu-dev.mjs)
+ content/global/ml/transformers-dev.js (vendor/transformers-dev.js)
+ content/global/ml/wllama-module-dev.mjs (vendor/wllama-module-dev.mjs)
+- content/global/ml/openai-dev.mjs (vendor/openai/dist/openai-dev.mjs)
++# content/global/ml/openai-dev.mjs (vendor/openai/dist/openai-dev.mjs)
+ #endif
+diff --git a/toolkit/content/license.html b/toolkit/content/license.html
+index a7403c9241da..5ec2326bfa00 100644
+--- a/toolkit/content/license.html
++++ b/toolkit/content/license.html
+@@ -1528,11 +1528,11 @@
+ } allowedCollections
++ * @returns {boolean} whether the bucket and collection are allowed to load
++ */
++ _isCollectionAllowedInternal(bucket, collection, allowedCollections) {
++ return (
++ allowedCollections.includes(`${bucket}/${collection}`) ||
++ allowedCollections.includes(`${bucket}/*`) ||
++ allowedCollections.includes("*")
++ );
++ },
++
++ /**
++ * Determines whether the bucket and collection are allowed to be loaded by the
++ * remote settings client.
++ * @param {string} bucket
++ * @param {string} collection
++ * @param {string} allowedCollections
++ * @returns {boolean} whether the bucket and collection are allowed to load
++ */
++ isCollectionAllowed(bucket, collection, allowedCollections) {
++ if (
++ this._isCollectionAllowedInternal(
++ bucket,
++ collection,
++ allowedCollections
++ )
++ ) {
++ return true;
++ }
++ console.warn(
++ `Connection attempt to RS collection "${bucket}/${collection}" was blocked/filtered.`
++ );
++ return false;
++ },
++
++ /**
++ * Determines whether the bucket and collection are allowed to be loaded from
++ * an in-tree remote settings dump.
++ * @param {string} bucket
++ * @param {string} collection
++ * @param {string} allowedCollections
++ * @param {string} allowedCollectionsFromDump
++ * @returns {boolean} whether the bucket and collection are allowed to load
++ */
++ isCollectionAllowedFromDump(bucket, collection, allowedCollections, allowedCollectionsFromDump) {
++ if (
++ this._isCollectionAllowedInternal(
++ bucket,
++ collection,
++ allowedCollectionsFromDump
++ ) ||
++ this._isCollectionAllowedInternal(
++ bucket,
++ collection,
++ allowedCollections
++ )
++ ) {
++ return true;
++ }
++ console.warn(
++ `Access attempt to RS collection "${bucket}/${collection}" from local dump was blocked/filtered.`
++ );
++ return false;
++ },
+ };
+diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs
+index 76f69ab..daf715c 100644
+--- a/services/settings/Utils.sys.mjs
++++ b/services/settings/Utils.sys.mjs
+@@ -91,6 +91,18 @@ XPCOMUtils.defineLazyPreferenceGetter(
+ false
+ );
+
++ChromeUtils.defineLazyGetter(lazy, "allowedCollections", () =>
++ Services.prefs
++ .getStringPref("librewolf.services.settings.allowedCollections", "")
++ .split(",")
++);
++
++ChromeUtils.defineLazyGetter(lazy, "allowedCollectionsFromDump", () =>
++ Services.prefs
++ .getStringPref("librewolf.services.settings.allowedCollectionsFromDump", "")
++ .split(",")
++);
++
+ function _isUndefined(value) {
+ return typeof value === "undefined";
+ }
+@@ -105,6 +117,14 @@ export var Utils = {
+ : AppConstants.REMOTE_SETTINGS_SERVER_URLS[0];
+ },
+
++ get allowedCollections() {
++ return lazy.allowedCollections;
++ },
++
++ get allowedCollectionsFromDump() {
++ return lazy.allowedCollectionsFromDump;
++ },
++
+ CHANGES_PATH: "/buckets/monitor/collections/changes/changeset",
+
+ /**
+@@ -393,7 +413,9 @@ export var Utils = {
+ if (lastModified === undefined) {
+ const { timestamp: dumpTimestamp } = await lazy.SharedUtils.loadJSONDump(
+ bucket,
+- collection
++ collection,
++ this.allowedCollections,
++ this.allowedCollectionsFromDump
+ );
+ // Client recognize -1 as missing dump.
+ lastModified = dumpTimestamp ?? -1;
+@@ -503,7 +525,9 @@ export var Utils = {
+ }
+
+ return {
+- changes,
++ changes: changes.filter(change =>
++ lazy.SharedUtils.isCollectionAllowed(change.bucket, change.collection, this.allowedCollections)
++ ),
+ timestamp,
+ serverTimeMillis,
+ backoffSeconds,
+
+diff --git a/toolkit/components/search/SearchEngineSelector.sys.mjs b/toolkit/components/search/SearchEngineSelector.sys.mjs
+index 3a42b38..3befe8d 100644
+--- a/toolkit/components/search/SearchEngineSelector.sys.mjs
++++ b/toolkit/components/search/SearchEngineSelector.sys.mjs
+@@ -409,13 +409,7 @@ export class SearchEngineSelector {
+ * could be obtained.
+ */
+ async #getConfigurationOverrides() {
+- let result = [];
+- try {
+- result = await this.#remoteConfigOverrides.get();
+- } catch (ex) {
+- // This data is remote only, so we just return an empty array if it fails.
+- }
+- return result;
++ return [];
+ }
+
+ /**
\ No newline at end of file
diff --git a/patches/android/vendor-name-esr.patch b/patches/android/vendor-name-esr.patch
new file mode 100644
index 000000000..18e8e48fc
--- /dev/null
+++ b/patches/android/vendor-name-esr.patch
@@ -0,0 +1,45 @@
+diff --git a/toolkit/components/extensions/parent/ext-runtime.js b/toolkit/components/extensions/parent/ext-runtime.js
+index 0d7a3e5..8853dd0 100644
+--- a/toolkit/components/extensions/parent/ext-runtime.js
++++ b/toolkit/components/extensions/parent/ext-runtime.js
+@@ -333,7 +333,15 @@ this.runtime = class extends ExtensionAPIPersistent {
+
+ getBrowserInfo: function () {
+ const { name, vendor, version, appBuildID } = Services.appinfo;
+- const info = { name, vendor, version, buildID: appBuildID };
++ const useFirefoxDefaults = Services.prefs.getBoolPref(
++ "librewolf.getBrowserInfo.setToFirefoxDefaults",
++ true
++ );
++
++ const info = useFirefoxDefaults
++ ? { name: "Firefox", vendor: "Mozilla", version, buildID: appBuildID }
++ : { name, vendor, version, buildID: appBuildID };
++
+ return Promise.resolve(info);
+ },
+
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+index 0b0e8a1..cdc2e52 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -2245,9 +2245,6 @@ static void DumpHelp() {
+ }
+
+ static inline void DumpVersion() {
+- if (gAppData->vendor && *gAppData->vendor) {
+- printf("%s ", (const char*)gAppData->vendor);
+- }
+ printf("%s ", (const char*)gAppData->name);
+
+ // Use the displayed version
+@@ -2261,9 +2258,6 @@ static inline void DumpVersion() {
+ }
+
+ static inline void DumpFullVersion() {
+- if (gAppData->vendor && *gAppData->vendor) {
+- printf("%s ", (const char*)gAppData->vendor);
+- }
+ printf("%s ", (const char*)gAppData->name);
+
+ // Use the displayed version
diff --git a/patches/android/webgl-permission-common-esr.patch b/patches/android/webgl-permission-common-esr.patch
new file mode 100644
index 000000000..bd67d967a
--- /dev/null
+++ b/patches/android/webgl-permission-common-esr.patch
@@ -0,0 +1,276 @@
+diff --git a/dom/canvas/ClientWebGLContext.cpp b/dom/canvas/ClientWebGLContext.cpp
+index a9e5603060..7ea09e134b 100644
+--- a/dom/canvas/ClientWebGLContext.cpp
++++ b/dom/canvas/ClientWebGLContext.cpp
+@@ -25,7 +25,9 @@
+ #include "mozilla/RandomNum.h"
+ #include "mozilla/ResultVariant.h"
+ #include "mozilla/ScopeExit.h"
++#include "mozilla/StaticPrefs_librewolf.h"
+ #include "mozilla/StaticPrefs_webgl.h"
++#include "mozilla/dom/BrowserChild.h"
+ #include "mozilla/dom/BufferSourceBinding.h"
+ #include "mozilla/dom/Document.h"
+ #include "mozilla/dom/GeneratePlaceholderCanvasData.h"
+@@ -46,6 +48,8 @@
+ #include "mozilla/layers/WebRenderUserData.h"
+ #include "nsContentUtils.h"
+ #include "nsDisplayList.h"
++#include "nsIPrincipal.h"
++#include "nsIPermissionManager.h"
+
+ namespace mozilla {
+
+@@ -849,6 +853,131 @@ static bool IsWebglOutOfProcessEnabled() {
+ return StaticPrefs::webgl_out_of_process();
+ }
+
++static uint32_t GetWebGLPermission(nsIPrincipal* aPrincipal) {
++ if (!aPrincipal) {
++ return nsIPermissionManager::UNKNOWN_ACTION;
++ }
++
++ if (IsUnrestrictedPrincipal(aPrincipal)) {
++ return true;
++ }
++
++ nsresult rv;
++ nsCOMPtr permissionManager =
++ do_GetService(NS_PERMISSIONMANAGER_CONTRACTID, &rv);
++ NS_ENSURE_SUCCESS(rv, nsIPermissionManager::UNKNOWN_ACTION);
++
++ uint32_t permission;
++ rv = permissionManager->TestPermissionFromPrincipal(
++ aPrincipal, "webgl"_ns, &permission);
++ NS_ENSURE_SUCCESS(rv, nsIPermissionManager::UNKNOWN_ACTION);
++
++ return permission;
++}
++
++static bool IsWebGLAllowed_impl(
++ bool webGLDisabled, JSContext* aCx,
++ nsIPrincipal* aPrincipal,
++ const std::function& aReportToConsole,
++ const std::function& aTryPrompt) {
++
++ if(!webGLDisabled) {
++ return true;
++ }
++
++ if (!aCx) {
++ return false;
++ }
++
++ if (IsUnrestrictedPrincipal(aPrincipal)) {
++ return true;
++ }
++
++ Maybe origin = Nothing();
++ auto getOrigin = [&]() {
++ if (origin.isSome()) {
++ return origin->IsEmpty();
++ }
++
++ nsAutoCString originResult;
++ nsresult rv = NS_ERROR_FAILURE;
++ if (aPrincipal) {
++ rv = aPrincipal->GetOrigin(originResult);
++ }
++ origin = NS_SUCCEEDED(rv) ? Some(originResult) : Some(""_ns);
++
++ return NS_SUCCEEDED(rv);
++ };
++
++ uint64_t permission = GetWebGLPermission(aPrincipal);
++ switch (permission) {
++ case nsIPermissionManager::ALLOW_ACTION:
++ return true;
++ case nsIPermissionManager::DENY_ACTION:
++ return false;
++ default:
++ break;
++ }
++
++ bool hidePermissionDoorhanger = StaticPrefs::librewolf_webgl_prompt_hide();
++
++ nsAutoString message;
++ message.AppendPrintf("Blocked %s from creating WebGL context but prompting the user.",
++ getOrigin() ? origin->get() : "unknown");
++ aReportToConsole(message);
++
++ aTryPrompt(hidePermissionDoorhanger);
++
++ return false;
++}
++
++static bool IsWebGLAllowed(dom::Document* aDocument, JSContext* aCx,
++ nsIPrincipal* aPrincipal) {
++ if(NS_WARN_IF(!aDocument)) {
++ return false;
++ }
++
++ bool webGLDisabled = StaticPrefs::librewolf_webgl_prompt();
++
++ if (!webGLDisabled) {
++ return true;
++ }
++
++ auto reportToConsole = [&](const nsAutoString& message) {
++ nsContentUtils::ReportToConsoleNonLocalized(
++ message, nsIScriptError::warningFlag, "Security"_ns, aDocument);
++ };
++
++ auto prompt = [&](bool hidePermissionDoorhanger) {
++ if (!aPrincipal) {
++ return;
++ }
++
++ nsAutoCString origin;
++ nsresult rv = aPrincipal->GetOrigin(origin);
++ if (NS_FAILED(rv)) {
++ return;
++ }
++
++ if (!XRE_IsContentProcess()) {
++ MOZ_ASSERT_UNREACHABLE(
++ "Who's calling this from the parent process without a chrome window "
++ "(it would have been exempt from the RFP targets)?");
++ return;
++ }
++
++ nsPIDOMWindowOuter* win = aDocument->GetWindow();
++ if (RefPtr browserChild =
++ dom::BrowserChild::GetFrom(win)) {
++ browserChild->SendShowWebGLPermissionPrompt(origin, hidePermissionDoorhanger);
++ }
++ };
++
++ return IsWebGLAllowed_impl(
++ webGLDisabled, aCx, aPrincipal,
++ reportToConsole, prompt);
++}
++
+ bool ClientWebGLContext::CreateHostContext(const uvec2& requestedSize) {
+ const auto pNotLost = MakeRefPtr(*this);
+ auto& notLost = *pNotLost;
+@@ -883,6 +1012,17 @@ bool ClientWebGLContext::CreateHostContext(const uvec2& requestedSize) {
+ .options = options,
+ };
+
++ if (mCanvasElement && !StaticPrefs::webgl_disabled()) {
++ if(!IsWebGLAllowed(mCanvasElement->OwnerDoc(),
++ nsContentUtils::GetCurrentJSContext(),
++ mCanvasElement->NodePrincipal())) {
++
++ return Err("WebGL is currently disabled.");
++ }
++ }
++
++
++
+ // -
+
+ auto useOop = IsWebglOutOfProcessEnabled();
+diff --git a/dom/ipc/BrowserParent.cpp b/dom/ipc/BrowserParent.cpp
+index 7d405ed7d3..95718de445 100644
+--- a/dom/ipc/BrowserParent.cpp
++++ b/dom/ipc/BrowserParent.cpp
+@@ -4115,6 +4115,29 @@ mozilla::ipc::IPCResult BrowserParent::RecvShowCanvasPermissionPrompt(
+ return IPC_OK();
+ }
+
++mozilla::ipc::IPCResult BrowserParent::RecvShowWebGLPermissionPrompt(const nsCString& aOrigin, const bool& aHideDoorHanger) {
++ nsCOMPtr browser =
++ mFrameElement ? mFrameElement->AsBrowser() : nullptr;
++ if (!browser) {
++ // If the tab is being closed, the browser may not be available.
++ // In this case we can ignore the request.
++ return IPC_OK();
++ }
++ nsCOMPtr os = services::GetObserverService();
++ if (!os) {
++ return IPC_FAIL_NO_REASON(this);
++ }
++ nsresult rv = os->NotifyObservers(
++ browser,
++ aHideDoorHanger ? "webgl-permissions-prompt-hide-doorhanger"
++ : "webgl-permissions-prompt",
++ NS_ConvertUTF8toUTF16(aOrigin).get());
++ if (NS_FAILED(rv)) {
++ return IPC_FAIL_NO_REASON(this);
++ }
++ return IPC_OK();
++}
++
+ mozilla::ipc::IPCResult BrowserParent::RecvVisitURI(
+ nsIURI* aURI, nsIURI* aLastVisitedURI, const uint32_t& aFlags,
+ const uint64_t& aBrowserId) {
+diff --git a/dom/ipc/BrowserParent.h b/dom/ipc/BrowserParent.h
+index 94d5cb546a..c98d7a6a9c 100644
+--- a/dom/ipc/BrowserParent.h
++++ b/dom/ipc/BrowserParent.h
+@@ -741,6 +741,8 @@ class BrowserParent final : public PBrowserParent,
+ mozilla::ipc::IPCResult RecvShowCanvasPermissionPrompt(
+ const nsCString& aOrigin, const bool& aHideDoorHanger);
+
++ mozilla::ipc::IPCResult RecvShowWebGLPermissionPrompt(const nsCString& aOrigin, const bool& aHideDoorHanger);
++
+ mozilla::ipc::IPCResult RecvSetSystemFont(const nsCString& aFontName);
+ mozilla::ipc::IPCResult RecvGetSystemFont(nsCString* aFontName);
+
+diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
+index 76dd02a60d..f045291425 100644
+--- a/dom/ipc/PBrowser.ipdl
++++ b/dom/ipc/PBrowser.ipdl
+@@ -642,6 +642,14 @@ parent:
+ */
+ async ShowCanvasPermissionPrompt(nsCString aOrigin,
+ bool aHideDoorHanger);
++ /**
++ * This function is used to notify the parent that it should display a
++ * WebGL permission prompt.
++ *
++ * @param aOrigin origin string of the document that is requesting access.
++ */
++ async ShowWebGLPermissionPrompt(nsCString aOrigin,
++ bool aHideDoorHanger);
+
+ sync SetSystemFont(nsCString aFontName);
+ sync GetSystemFont() returns (nsCString retval);
+diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
+index 262eee800b..109c04fc9d 100644
+--- a/modules/libpref/init/StaticPrefList.yaml
++++ b/modules/libpref/init/StaticPrefList.yaml
+@@ -11368,6 +11368,20 @@
+ value: false
+ mirror: always
+
++#---------------------------------------------------------------------------
++# Prefs starting with "librewolf."
++#---------------------------------------------------------------------------
++
++- name: librewolf.webgl.prompt
++ type: RelaxedAtomicBool
++ value: true
++ mirror: always
++
++- name: librewolf.webgl.prompt.hide
++ type: RelaxedAtomicBool
++ value: true
++ mirror: always
++
+ #---------------------------------------------------------------------------
+ # Prefs starting with "logging."
+ #---------------------------------------------------------------------------
+diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
+index 46034d8d99..9807b024b8 100644
+--- a/modules/libpref/moz.build
++++ b/modules/libpref/moz.build
+@@ -59,6 +59,7 @@ pref_groups = [
+ "javascript",
+ "layers",
+ "layout",
++ "librewolf",
+ "logging",
+ "mathml",
+ "media",
diff --git a/patches/android/webgl-prompt-default.patch b/patches/android/webgl-prompt-default.patch
index 5c3efe6a5..03b95c35f 100644
--- a/patches/android/webgl-prompt-default.patch
+++ b/patches/android/webgl-prompt-default.patch
@@ -1,8 +1,13 @@
# LibreWolf webgl-prompt-default.patch
#
# Upstream file touched: modules/libpref/init/StaticPrefList.yaml
-# (the `librewolf.webgl.prompt` entry that patches/webgl-permission-common.patch
-# adds to it — this patch applies AFTER that one, i.e. after common.txt)
+# (the `librewolf.webgl.prompt` entry that
+# patches/android/webgl-permission-common-esr.patch adds to it — this patch
+# applies AFTER that one, which is listed above it in android.txt.
+# Until the Firefox 157 desktop merge that predecessor was
+# patches/webgl-permission-common.patch in common.txt; the -esr file is its
+# byte-identical pre-merge text, kept for Android's 153.0esr tree while the
+# 157 rewrite of webgl-permission-common.patch moved to desktop.txt)
#
# What LibreWolf wants instead, and why
# -------------------------------------
@@ -40,15 +45,17 @@
# ("the librewolf.webgl.prompt default that landmine L1 requires").
#
# The README's drift hazard does not apply: the context below is LibreWolf's own
-# pref block, not upstream text, so if webgl-permission-common.patch ever stops
+# pref block, not upstream text, so if webgl-permission-common-esr.patch ever stops
# applying this patch rejects loudly too rather than applying against something
# it did not mean.
#
# Ordering (load-bearing)
# -----------------------
-# Requires patches/webgl-permission-common.patch to have been applied first.
-# assets/patches/common.txt is always applied before android.txt, so listing this
-# in android.txt is enough.
+# Requires patches/android/webgl-permission-common-esr.patch to have been
+# applied first. Both are android.txt entries since the Firefox 157 desktop
+# merge, so the order is their position in that list (the -esr entry comes
+# first; scripts/check-patch-order.py enforces it). Before the merge the
+# predecessor was in common.txt, which is always applied before android.txt.
#
# Nothing happens outside this diff (landmine L4): no file copies, no rm, no
# generated file is edited by hand. The value reaches the binary through
diff --git a/patches/canvas-permission.patch b/patches/canvas-permission.patch
new file mode 100644
index 000000000..b0ce8a9ad
--- /dev/null
+++ b/patches/canvas-permission.patch
@@ -0,0 +1,151 @@
+diff --git a/browser/modules/SitePermissions.sys.mjs b/browser/modules/SitePermissions.sys.mjs
+index d8be7e7644..81aad0a569 100644
+--- a/browser/modules/SitePermissions.sys.mjs
++++ b/browser/modules/SitePermissions.sys.mjs
+@@ -3,6 +3,7 @@
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
++import { RFPHelper } from "resource://gre/modules/RFPHelper.sys.mjs";
+
+ var gStringBundle = Services.strings.createBundle(
+ "chrome://browser/locale/sitePermissions.properties"
+@@ -811,6 +812,67 @@ export var SitePermissions = {
+ return null;
+ }
+ },
++
++ /**
++ * Computes whether the canvas image extraction prompt is enabled
++ * based on Baseline/FPP settings and their respective overrides.
++ *
++ * @returns {boolean} true if CanvasImageExtractionPrompt/AllTargets is active
++ */
++ _computeCanvasImageExtractionEnabled() {
++ const fppEnabled = this.fingerprintingProtectionEnabled;
++ const baselineEnabled = this.baselineFingerprintingProtectionEnabled;
++
++ if (fppEnabled) {
++ const defaults = RFPHelper.getTargetDefaults();
++ const active = new Set(defaults);
++ const overrides = this.fingerprintingProtectionOverrides;
++ this._applyOverrides(active, overrides);
++ if (active.has("CanvasImageExtractionPrompt")) {
++ return true;
++ }
++ }
++
++ if (baselineEnabled) {
++ const defaults = RFPHelper.getTargetDefaultsBaseline();
++ const active = new Set(defaults);
++ const overrides = this.baselineFingerprintingProtectionOverrides;
++ this._applyOverrides(active, overrides);
++ if (active.has("CanvasImageExtractionPrompt")) {
++ return true;
++ }
++ }
++
++ return false;
++ },
++
++ /**
++ * Applies override flags to an active set of targets.
++ *
++ * @param {Set} active - The active targets set
++ * @param {string} overridesString - The override string (e.g., "+CanvasImageExtractionPrompt,+AllTargets")
++ */
++ _applyOverrides(active, overridesString) {
++ for (const flag of overridesString.split(",").filter(Boolean)) {
++ if (flag.startsWith("+")) {
++ const target = flag.slice(1);
++ if (
++ target === "AllTargets" ||
++ target === "CanvasImageExtractionPrompt"
++ ) {
++ active.add("CanvasImageExtractionPrompt");
++ }
++ } else if (flag.startsWith("-")) {
++ const target = flag.slice(1);
++ if (
++ target === "AllTargets" ||
++ target === "CanvasImageExtractionPrompt"
++ ) {
++ active.delete("CanvasImageExtractionPrompt");
++ }
++ }
++ }
++ },
+ };
+
+ let gPermissions = {
+@@ -1073,7 +1135,10 @@ let gPermissions = {
+
+ canvas: {
+ get disabled() {
+- return !SitePermissions.resistFingerprinting;
++ return (
++ !SitePermissions.resistFingerprinting &&
++ !SitePermissions._computeCanvasImageExtractionEnabled()
++ );
+ },
+ },
+
+@@ -1137,6 +1202,37 @@ XPCOMUtils.defineLazyPreferenceGetter(
+ false,
+ SitePermissions.invalidatePermissionList.bind(SitePermissions)
+ );
++XPCOMUtils.defineLazyPreferenceGetter(
++ SitePermissions,
++ "fingerprintingProtectionEnabled",
++ "privacy.fingerprintingProtection",
++ false,
++ SitePermissions.invalidatePermissionList.bind(SitePermissions)
++);
++
++XPCOMUtils.defineLazyPreferenceGetter(
++ SitePermissions,
++ "fingerprintingProtectionOverrides",
++ "privacy.fingerprintingProtection.overrides",
++ "",
++ SitePermissions.invalidatePermissionList.bind(SitePermissions)
++);
++
++XPCOMUtils.defineLazyPreferenceGetter(
++ SitePermissions,
++ "baselineFingerprintingProtectionEnabled",
++ "privacy.baselineFingerprintingProtection",
++ false,
++ SitePermissions.invalidatePermissionList.bind(SitePermissions)
++);
++
++XPCOMUtils.defineLazyPreferenceGetter(
++ SitePermissions,
++ "baselineFingerprintingProtectionOverrides",
++ "privacy.baselineFingerprintingProtection.overrides",
++ "",
++ SitePermissions.invalidatePermissionList.bind(SitePermissions)
++);
+
+ XPCOMUtils.defineLazyPreferenceGetter(
+ SitePermissions,
+diff --git a/toolkit/components/resistfingerprinting/RFPHelper.sys.mjs b/toolkit/components/resistfingerprinting/RFPHelper.sys.mjs
+index f82d7309e1..d11f8a011f 100644
+--- a/toolkit/components/resistfingerprinting/RFPHelper.sys.mjs
++++ b/toolkit/components/resistfingerprinting/RFPHelper.sys.mjs
+@@ -208,8 +208,14 @@ class _RFPHelper {
+ return;
+ }
+
+- let loadContext = notificationCallbacks.getInterface(Ci.nsILoadContext);
+- if (!loadContext || !loadContext.isContent) {
++ let loadContext;
++ try {
++ loadContext = notificationCallbacks.getInterface(Ci.nsILoadContext);
++ } catch (e) {
++ return;
++ }
++
++ if (!loadContext.isContent) {
+ return;
+ }
+
diff --git a/patches/clear-alt-svc.patch b/patches/clear-alt-svc.patch
new file mode 100644
index 000000000..ea95d3a75
--- /dev/null
+++ b/patches/clear-alt-svc.patch
@@ -0,0 +1,24 @@
+diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
+index 78da5858bfe5..3f13d96152f9 100644
+--- a/netwerk/protocol/http/nsHttpHandler.cpp
++++ b/netwerk/protocol/http/nsHttpHandler.cpp
+@@ -9,6 +9,7 @@
+
+ #include "ASpdySession.h"
+ #include "AltServiceChild.h"
++#include "CacheObserver.h"
+ #include "EventTokenBucket.h"
+ #include "HttpLog.h"
+ #include "LoadContextInfo.h"
+@@ -2330,6 +2331,11 @@ nsHttpHandler::Observe(nsISupports* subject, const char* topic,
+ // clear cache of all authentication credentials.
+ mAuthCache->ClearAll();
+ mPrivateAuthCache->ClearAll();
++
++ if (CacheObserver::ClearCacheOnShutdown() && mAltSvcCache) {
++ mAltSvcCache->ClearAltServiceMappings();
++ }
++
+ if (mWifiTickler) mWifiTickler->Cancel();
+
+ // Inform nsIOService that network is tearing down.
diff --git a/patches/delete-cookie-permission.patch b/patches/delete-cookie-permission.patch
new file mode 100644
index 000000000..026e71679
--- /dev/null
+++ b/patches/delete-cookie-permission.patch
@@ -0,0 +1,30 @@
+diff --git a/browser/components/ProfileDataUpgrader.sys.mjs b/browser/components/ProfileDataUpgrader.sys.mjs
+index 344f311..9197788 100644
+--- a/browser/components/ProfileDataUpgrader.sys.mjs
++++ b/browser/components/ProfileDataUpgrader.sys.mjs
+@@ -1030,6 +1030,9 @@ export let ProfileDataUpgrader = {
+ // Only migrate durable, user-set permissions. Anything that expires
+ // (session/time) or is re-applied from an enterprise policy on every
+ // startup (EXPIRE_POLICY) must not be persisted as a regular permission.
++
++ const toDelete = [];
++
+ Services.perms.getAllByTypes(["cookie"]).forEach(p => {
+ if (p.expireType != Services.perms.EXPIRE_NEVER) {
+ return;
+@@ -1040,8 +1043,15 @@ export let ProfileDataUpgrader = {
+ "persist-data-on-shutdown",
+ Ci.nsICookiePermission.ACCESS_ALLOW
+ );
++ toDelete.push(p);
+ }
+ });
++
++ toDelete.forEach(p => {
++ Services.perms.removePermission(p);
++ });
++
++ Services.perms.removeOrphanedInteractionRecords();
+ }
+
+ if (
diff --git a/patches/disable-data-reporting-common.patch b/patches/disable-data-reporting-common.patch
index 733ce361f..2e397b7be 100644
--- a/patches/disable-data-reporting-common.patch
+++ b/patches/disable-data-reporting-common.patch
@@ -1,17 +1,46 @@
Disable data reporting at compile time -- COMMON half (LW-M1-02).
-Split out of patches/disable-data-reporting-at-compile-time.patch, which was a
-straddler: it mixed toolkit/python hunks that are built on every target with two
-browser/-only hunks. The browser/ half now lives in
-patches/disable-data-reporting-desktop.patch; common + desktop together are
-byte-for-byte the original patch.
+Split out of upstream's patches/disable-data-reporting-at-compile-time.patch,
+which is a straddler: it mixes toolkit/python hunks that are built on every
+target with browser/-only hunks. This file holds the target-independent hunks;
+patches/disable-data-reporting-desktop.patch holds the browser/ hunks and the
+hunks whose context only exists in the desktop Firefox version. common + desktop
+together are byte-for-byte upstream's current patch.
-What is here (all built on Android, checked against firefox-153.0.4):
+LISTED IN desktop.txt, NOT common.txt, SINCE THE FIREFOX 157 DESKTOP MERGE.
+Desktop builds firefox-157.0; Android builds firefox-153.0esr (version.android)
+and its patched tree is held byte-identical to the pre-merge one. So Android
+does not apply this file: it applies the pre-merge common half verbatim,
+patches/android/disable-data-reporting-common-esr.patch, followed by
+patches/android/disable-data-reporting-android.patch (also pre-merge bytes),
+both in assets/patches/android.txt. Re-merge this file into common.txt (and drop
+the -esr copy) when Android moves to an ESR >= 157.
+
+What is here:
python/mach/mach/telemetry.py mach telemetry, target-independent
- python/sites/mach.txt drops the glean-sdk pypi requirement
- toolkit/components/glean/src/init/mod.rs Glean core MPS + internal pings off
toolkit/components/telemetry/core/Telemetry.cpp TelemetryImpl never records
toolkit/library/rust/gkrust-features.mozbuild glean_disable_upload for official builds
+ toolkit/components/telemetry/core/Stopwatch.cpp,
+ toolkit/components/telemetry/core/TelemetryUserInteraction.{cpp,h}
+ upstream fb4c7a32: with telemetry off,
+ UserInteraction.* calls stop logging
+ "cannot be recorded" errors. This
+ replaces the old tabbrowser.js hunk
+ (dropped upstream in a1bd18fa).
+
+What is NOT here any more, and why (both became version-specific at 157):
+ python/sites/mach.txt pins the glean-sdk version (68.0.1 on 157, 67.3.2 on
+ 153esr) -> the 157 hunk is in the desktop half; the
+ 153esr hunk is in disable-data-reporting-common-esr.
+ glean disable hunks 157: upstream patches third_party/rust/glean-core
+ (lib.rs, core/mod.rs) -> desktop half; the matching
+ .cargo-checksum.json hashes rewritten by
+ scripts/librewolf-patches.py are the 157 hashes and do
+ NOT match the 153esr files.
+ 153esr: toolkit/components/glean/src/init/mod.rs
+ (use_core_mps / enable_internal_pings false), kept in
+ disable-data-reporting-common-esr; on 157 that code
+ became a builder and the hunk rejects.
WHERE THE ANDROID OFF SWITCH LIVES -- READ THIS BEFORE ASSUMING THIS PATCH IS
ENOUGH ON ANDROID.
@@ -29,12 +58,14 @@ end supplies its own:
mobile/android/moz.configure:131 MOZ_NORMANDY False (already off)
mobile/android/moz.configure:132 MOZ_SERVICES_HEALTHREPORT True (still ON)
-So on Android this patch alone leaves MOZ_SERVICES_HEALTHREPORT defined and
-MOZ_DATA_REPORTING with it. That is closed by
+So on Android the common half alone (today: its 153esr copy,
+patches/android/disable-data-reporting-common-esr.patch) leaves
+MOZ_SERVICES_HEALTHREPORT defined and MOZ_DATA_REPORTING with it. That is
+closed by
patches/android/disable-data-reporting-android.patch (assets/patches/android.txt)
-which must be applied alongside this one for every Android build. Do not try to
+which must be applied alongside the common half for every Android build. Do not try to
close it from the mozconfig: assets/mozconfig.android's
`mk_add_options MOZ_SERVICES_HEALTHREPORT=0` is make-level only
(python/mozbuild/mozbuild/mozconfig.py routes mk_add_options into make_extra and
@@ -57,39 +88,6 @@ index 2b70b3f..b111dac 100644
def arcrc_path():
-diff --git a/python/sites/mach.txt b/python/sites/mach.txt
-index 8f4aa95..eb1e871 100644
---- a/python/sites/mach.txt
-+++ b/python/sites/mach.txt
-@@ -58,7 +58,7 @@ pth:xpcom/geckoprocesstypes_generator
- pth:xpcom/idl-parser
- # glean-sdk may not be installable if a wheel isn't available
- # and it has to be built from source.
--pypi-optional:glean-sdk==67.3.2:telemetry will not be collected
-+# pypi-optional:glean-sdk==67.3.2:telemetry will not be collected
- pypi-optional:orjson>=3.10:json operations will be slower in various tools
- # Mach gracefully handles the case where `psutil` is unavailable.
- # We aren't (yet) able to pin packages in automation, so we have to
-diff --git a/toolkit/components/glean/src/init/mod.rs b/toolkit/components/glean/src/init/mod.rs
-index 8ebf827..80eaa4c 100644
---- a/toolkit/components/glean/src/init/mod.rs
-+++ b/toolkit/components/glean/src/init/mod.rs
-@@ -189,13 +189,13 @@ fn build_configuration(
- delay_ping_lifetime_io: true,
- server_endpoint: Some(server),
- uploader: None,
-- use_core_mps: true,
-+ use_core_mps: false,
- trim_data_to_registered_pings: true,
- log_level: None,
- rate_limit,
- enable_event_timestamps: true,
- experimentation_id: None,
-- enable_internal_pings: true,
-+ enable_internal_pings: false,
- ping_schedule: pings::ping_schedule(),
- ping_lifetime_threshold: 0,
- ping_lifetime_max_time: Duration::ZERO,
diff --git a/toolkit/components/telemetry/core/Telemetry.cpp b/toolkit/components/telemetry/core/Telemetry.cpp
index 1e83d34..474bc5c 100644
--- a/toolkit/components/telemetry/core/Telemetry.cpp
@@ -134,3 +132,67 @@ index a3f1cc3..715f58b 100644
gkrust_features += ["glean_disable_upload"]
if CONFIG["MOZ_ENABLE_DBUS"]:
+diff --git a/toolkit/components/telemetry/core/Stopwatch.cpp b/toolkit/components/telemetry/core/Stopwatch.cpp
+index 9fcd929d83..f5f02bb921 100644
+--- a/toolkit/components/telemetry/core/Stopwatch.cpp
++++ b/toolkit/components/telemetry/core/Stopwatch.cpp
+@@ -315,7 +315,7 @@ bool Timers::StartUserInteraction(JSContext* aCx,
+ // Ensure that this ID maps to a UserInteraction that can be recorded
+ // for this product.
+ if (!TelemetryUserInteraction::CanRecord(aUserInteraction)) {
+- if (!mSuppressErrors) {
++ if (TelemetryUserInteraction::IsRecordingEnabled() && !mSuppressErrors) {
+ LogError(aCx, nsPrintfCString(
+ "UserInteraction with name \"%s\" cannot be recorded.",
+ NS_ConvertUTF16toUTF8(aUserInteraction).get()));
+@@ -383,7 +383,7 @@ bool Timers::UpdateUserInteraction(JSContext* aCx,
+ // Ensure that this ID maps to a UserInteraction that can be recorded
+ // for this product.
+ if (!TelemetryUserInteraction::CanRecord(aUserInteraction)) {
+- if (!mSuppressErrors) {
++ if (TelemetryUserInteraction::IsRecordingEnabled() && !mSuppressErrors) {
+ LogError(aCx, nsPrintfCString(
+ "UserInteraction with name \"%s\" cannot be recorded.",
+ NS_ConvertUTF16toUTF8(aUserInteraction).get()));
+@@ -416,7 +416,7 @@ bool Timers::FinishUserInteraction(
+ // Ensure that this ID maps to a UserInteraction that can be recorded
+ // for this product.
+ if (!TelemetryUserInteraction::CanRecord(aUserInteraction)) {
+- if (!mSuppressErrors) {
++ if (TelemetryUserInteraction::IsRecordingEnabled() && !mSuppressErrors) {
+ LogError(aCx, nsPrintfCString(
+ "UserInteraction with id \"%s\" cannot be recorded.",
+ NS_ConvertUTF16toUTF8(aUserInteraction).get()));
+@@ -467,7 +467,7 @@ bool Timers::CancelUserInteraction(JSContext* aCx,
+ // Ensure that this ID maps to a UserInteraction that can be recorded
+ // for this product.
+ if (!TelemetryUserInteraction::CanRecord(aUserInteraction)) {
+- if (!mSuppressErrors) {
++ if (TelemetryUserInteraction::IsRecordingEnabled() && !mSuppressErrors) {
+ LogError(aCx, nsPrintfCString(
+ "UserInteraction with id \"%s\" cannot be recorded.",
+ NS_ConvertUTF16toUTF8(aUserInteraction).get()));
+diff --git a/toolkit/components/telemetry/core/TelemetryUserInteraction.cpp b/toolkit/components/telemetry/core/TelemetryUserInteraction.cpp
+index c71fe5b6c6..6ea3c93773 100644
+--- a/toolkit/components/telemetry/core/TelemetryUserInteraction.cpp
++++ b/toolkit/components/telemetry/core/TelemetryUserInteraction.cpp
+@@ -94,3 +94,7 @@ bool TelemetryUserInteraction::CanRecord(const nsAString& aName) {
+
+ return false;
+ }
++
++bool TelemetryUserInteraction::IsRecordingEnabled() {
++ return gTelemetryUserInteractionCanRecord;
++}
+diff --git a/toolkit/components/telemetry/core/TelemetryUserInteraction.h b/toolkit/components/telemetry/core/TelemetryUserInteraction.h
+index 0db315684f..39dcbc4cfa 100644
+--- a/toolkit/components/telemetry/core/TelemetryUserInteraction.h
++++ b/toolkit/components/telemetry/core/TelemetryUserInteraction.h
+@@ -13,6 +13,7 @@ void InitializeGlobalState(bool canRecord);
+ void DeInitializeGlobalState();
+
+ bool CanRecord(const nsAString& aName);
++bool IsRecordingEnabled();
+
+ } // namespace TelemetryUserInteraction
+
diff --git a/patches/disable-data-reporting-desktop.patch b/patches/disable-data-reporting-desktop.patch
index 64da4d7b8..677cf6e95 100644
--- a/patches/disable-data-reporting-desktop.patch
+++ b/patches/disable-data-reporting-desktop.patch
@@ -1,15 +1,17 @@
Disable data reporting at compile time -- DESKTOP half (LW-M1-02).
-Split out of patches/disable-data-reporting-at-compile-time.patch. The two hunks
-below are the ones that only exist in a desktop build; everything else in the
-original patch is in patches/disable-data-reporting-common.patch. Applying
-common + desktop to a pristine tree reproduces the original patch byte for byte.
+Split out of upstream's patches/disable-data-reporting-at-compile-time.patch.
+The hunks below are the ones that only exist in a desktop build, or only in the
+desktop Firefox version (firefox-157.0; Android builds firefox-153.0esr, see
+version.android). Everything else in the upstream patch is in
+patches/disable-data-reporting-common.patch; common + desktop together are
+byte-for-byte upstream's current patch.
browser/moz.configure
MOZ_SERVICES_HEALTHREPORT and MOZ_NORMANDY -> False. These are the two
front-end inputs to MOZ_DATA_REPORTING (toolkit/moz.configure:3493-3507);
turning them off is what takes the datareporting.policy.* block in
- modules/libpref/init/all.js:3724-3733 out of the build.
+ modules/libpref/init/all.js out of the build.
This file only exists for the desktop front end -- browser/app.mozbuild:11
pulls /browser in and mobile/android/app.mozbuild never does -- so it can
do nothing for Android. mobile/android/moz.configure:131-132 supplies the
@@ -17,11 +19,28 @@ common + desktop to a pristine tree reproduces the original patch byte for byte.
equivalent of this hunk is
patches/android/disable-data-reporting-android.patch.
- browser/components/tabbrowser/content/tabbrowser.js
- Drops the UserInteraction.start/update("browser.tabs.opening") probes.
- UserInteraction is a Glean/telemetry stopwatch; there is no Fenix
- counterpart to remove -- tabbrowser.js is XUL tab UI that Android does not
- build at all.
+ python/sites/mach.txt
+ Comments out the glean-sdk pypi requirement. The pinned version is part of
+ the context (68.0.1 on 157), so the hunk is version-specific; the 153esr
+ variant (67.3.2) is in patches/android/disable-data-reporting-common-esr.patch.
+
+ third_party/rust/glean-core/src/lib.rs, third_party/rust/glean-core/src/core/mod.rs
+ Glean upload/collection forced off inside glean-core (upstream 77f8fcd8,
+ which replaced the old toolkit/components/glean/src/init/mod.rs hunk --
+ on 157 build_configuration() uses a builder and that hunk rejects).
+ glean-core is a vendored crate: scripts/librewolf-patches.py rewrites the
+ two affected hashes in third_party/rust/glean-core/.cargo-checksum.json
+ (upstream f072d15c). Those hashes are the 157 file hashes, which is why
+ these hunks cannot be common: they apply to 153esr too, but there the
+ checksum rewrite does not match and the vendored crate fails its check.
+ The 153esr equivalent (init/mod.rs) is in
+ patches/android/disable-data-reporting-common-esr.patch.
+
+ (Gone: the browser/components/tabbrowser/content/tabbrowser.js hunk that
+ removed the UserInteraction "browser.tabs.opening" probes. Upstream dropped it
+ in a1bd18fa for 156 and instead silences UserInteraction errors in
+ toolkit/components/telemetry/core/Stopwatch.cpp, fb4c7a32 -- that part is
+ in the common half.)
diff --git a/browser/moz.configure b/browser/moz.configure
index 3ea3d88..c55951b 100644
@@ -41,27 +60,51 @@ index 3ea3d88..c55951b 100644
imply_option("MOZ_PROFILE_MIGRATOR", True)
-diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index c42b1a1a8d..bea12fa0fa 100644
---- a/browser/components/tabbrowser/content/tabbrowser.js
-+++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -3330,10 +3330,6 @@
- );
- }
-
-- if (!UserInteraction.running("browser.tabs.opening", window)) {
-- UserInteraction.start("browser.tabs.opening", "initting", window);
-- }
--
- // If we're opening a foreground tab, set the owner by default.
- ownerTab ??= inBackground ? null : this.selectedTab;
+diff --git a/python/sites/mach.txt b/python/sites/mach.txt
+index d5cdce8..f4f38c1 100644
+--- a/python/sites/mach.txt
++++ b/python/sites/mach.txt
+@@ -58,7 +58,7 @@ pth:xpcom/geckoprocesstypes_generator
+ pth:xpcom/idl-parser
+ # glean-sdk may not be installable if a wheel isn't available
+ # and it has to be built from source.
+-pypi-optional:glean-sdk==68.0.1:telemetry will not be collected
++# pypi-optional:glean-sdk==68.0.1:telemetry will not be collected
+ pypi-optional:orjson>=3.10:json operations will be slower in various tools
+ # Mach gracefully handles the case where `psutil` is unavailable.
+ # We aren't (yet) able to pin packages in automation, so we have to
+diff --git a/third_party/rust/glean-core/src/lib.rs b/third_party/rust/glean-core/src/lib.rs
+index c401c3d..d6c744a 100644
+--- a/third_party/rust/glean-core/src/lib.rs
++++ b/third_party/rust/glean-core/src/lib.rs
+@@ -916,6 +916,7 @@ pub extern "C" fn glean_enable_logging() {
+ /// **DEPRECATION NOTICE**:
+ /// This API is deprecated. Use `set_collection_enabled` instead.
+ pub fn glean_set_upload_enabled(enabled: bool) {
++ let enabled = false;
+ if !was_initialize_called() {
+ return;
+ }
+@@ -951,6 +952,8 @@ pub fn glean_set_upload_enabled(enabled: bool) {
+ ///
+ /// This replaces `set_upload_enabled`.
+ pub fn glean_set_collection_enabled(enabled: bool) {
++ // Redundant currently
++ let enabled = false;
+ glean_set_upload_enabled(enabled)
+ }
-@@ -4205,8 +4201,6 @@
- 0,
- this.tabContainer
- );
-- } else {
-- UserInteraction.update("browser.tabs.opening", "animated", window);
- }
+diff --git a/third_party/rust/glean-core/src/core/mod.rs b/third_party/rust/glean-core/src/core/mod.rs
+index 0130646..1370f08 100644
+--- a/third_party/rust/glean-core/src/core/mod.rs
++++ b/third_party/rust/glean-core/src/core/mod.rs
+@@ -813,7 +813,8 @@ impl Glean {
+ ///
+ /// When upload is disabled, no data will be recorded.
+ pub fn is_upload_enabled(&self) -> bool {
+- self.upload_enabled
++ _ = self.upload_enabled;
++ false
+ }
- return t;
\ No newline at end of file
+ /// Check if a ping is enabled.
diff --git a/patches/display-version.patch b/patches/display-version.patch
new file mode 100644
index 000000000..e36ffabc6
--- /dev/null
+++ b/patches/display-version.patch
@@ -0,0 +1,50 @@
+diff --git a/toolkit/components/urlformatter/URLFormatter.sys.mjs b/toolkit/components/urlformatter/URLFormatter.sys.mjs
+index 0485032..b802ffd 100644
+--- a/toolkit/components/urlformatter/URLFormatter.sys.mjs
++++ b/toolkit/components/urlformatter/URLFormatter.sys.mjs
+@@ -90,6 +90,9 @@ nsURLFormatterService.prototype = {
+ VERSION() {
+ return Services.appinfo.version;
+ },
++ VERSION_DISPLAY() {
++ return AppConstants.MOZ_APP_VERSION_DISPLAY;
++ },
+ MAJOR_VERSION() {
+ return Services.appinfo.version.replace(
+ /^([^\.]+\.[0-9]+[a-z]*).*/gi,
+diff --git a/toolkit/mozapps/update/UpdateListener.sys.mjs b/toolkit/mozapps/update/UpdateListener.sys.mjs
+index b689833..a38698c 100644
+--- a/toolkit/mozapps/update/UpdateListener.sys.mjs
++++ b/toolkit/mozapps/update/UpdateListener.sys.mjs
+@@ -188,30 +188,7 @@ export var UpdateListener = {
+
+ getReleaseNotesUrl(update) {
+ try {
+- // Release notes are enabled by default for EN locales only, but can be
+- // enabled for other locales within an experiment.
+- if (
+- !Services.locale.appLocaleAsBCP47.startsWith("en") &&
+- !lazy.NimbusFeatures.updatePrompt.getVariable("showReleaseNotesLink")
+- ) {
+- return null;
+- }
+- // The release notes URL is set in the pref app.releaseNotesURL.prompt,
+- // but can also be overridden by an experiment.
+- let url = lazy.NimbusFeatures.updatePrompt.getVariable("releaseNotesURL");
+- if (url) {
+- let versionString = update.appVersion;
+- switch (update.channel) {
+- case "aurora":
+- case "beta":
+- versionString += "beta";
+- break;
+- }
+- url = Services.urlFormatter.formatURL(
+- url.replace("%VERSION%", versionString)
+- );
+- }
+- return url || null;
++ return Services.urlFormatter.formatURLPref("app.releaseNotesURL.prompt");
+ } catch (error) {
+ return null;
+ }
diff --git a/patches/eme-migrator.patch b/patches/eme-migrator.patch
new file mode 100644
index 000000000..384500422
--- /dev/null
+++ b/patches/eme-migrator.patch
@@ -0,0 +1,26 @@
+diff --git a/browser/components/ProfileDataUpgrader.sys.mjs b/browser/components/ProfileDataUpgrader.sys.mjs
+index ca6f1f6..5922656 100644
+--- a/browser/components/ProfileDataUpgrader.sys.mjs
++++ b/browser/components/ProfileDataUpgrader.sys.mjs
+@@ -1087,6 +1087,21 @@ export let ProfileDataUpgrader = {
+ if (!Services.prefs.prefHasUserValue(IPP_HAS_SEEN_FEATURE_PREF)) {
+ Services.prefs.setBoolPref(IPP_HAS_SEEN_FEATURE_PREF, true);
+ }
++
++ if (Services.prefs.prefHasUserValue("media.eme.enabled")) {
++ if (!Services.prefs.prefHasUserValue("media.gmp-manager.updateEnabled")) {
++ Services.prefs.setBoolPref("media.gmp-manager.updateEnabled", true);
++ }
++ if (!Services.prefs.prefHasUserValue("media.gmp-widevinecdm.enabled")) {
++ Services.prefs.setBoolPref("media.gmp-widevinecdm.enabled", true);
++ }
++ }
++
++ if (Services.prefs.prefHasUserValue("media.gmp-gmpopenh264.enabled")) {
++ if (!Services.prefs.prefHasUserValue("media.gmp-manager.updateEnabled")) {
++ Services.prefs.setBoolPref("media.gmp-manager.updateEnabled", true);
++ }
++ }
+ }
+
+ if (existingDataVersion < 181) {
diff --git a/patches/hide-disabled-urlbar-suggests.patch b/patches/hide-disabled-urlbar-suggests.patch
new file mode 100644
index 000000000..1e262c8ae
--- /dev/null
+++ b/patches/hide-disabled-urlbar-suggests.patch
@@ -0,0 +1,29 @@
+diff --git a/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs b/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs
+index 691fcea3a1..838512efba 100644
+--- a/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs
++++ b/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs
+@@ -11,6 +11,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
+ "moz-src:///browser/components/urlbar/ActionsProviderQuickActions.sys.mjs",
+ BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
+ DevToolsShim: "chrome://devtools-startup/content/DevToolsShim.sys.mjs",
++ ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
+ ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs",
+ ScreenshotsUtils:
+ "moz-src:///browser/components/screenshots/ScreenshotsUtils.sys.mjs",
+@@ -112,6 +113,8 @@ const DEFAULT_ACTIONS = {
+ icon: "chrome://global/skin/icons/highlights.svg",
+ label: "quickactions-manageai",
+ onPick: openUrlFun("about:preferences#ai"),
++ isUnsupported: () =>
++ !Services.prefs.getBoolPref("browser.preferences.aiControls", false),
+ },
+ downloads: {
+ l10nCommands: ["quickactions-cmd-downloads"],
+@@ -337,6 +340,7 @@ const DEFAULT_ACTIONS = {
+ l10nCommands: ["quickactions-cmd-labs"],
+ icon: "chrome://global/skin/icons/experiments.svg",
+ label: "quickactions-labs",
++ isUnsupported: () => !lazy.ExperimentAPI.labsEnabled,
+ onPick: openUrlFun("about:preferences#experimental"),
+ },
+ };
diff --git a/patches/hide-passwordmgr.patch b/patches/hide-passwordmgr.patch
deleted file mode 100644
index 7e24c5c68..000000000
--- a/patches/hide-passwordmgr.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/browser/base/content/browser-init.js
-+++ b/browser/base/content/browser-init.js
-@@ -300,6 +300,13 @@ var gBrowserInit = {
- )?.removeAttribute("key");
- }
-
-+ if (Services.prefs.getBoolPref("librewolf.hidePasswdmgr", false)) {
-+ PanelMultiView.getViewNode(
-+ document,
-+ "appMenu-passwords-button"
-+ )?.remove();
-+ }
-+
- this._loadHandled = true;
- },
-
---- a/browser/components/preferences/privacy.js
-+++ b/browser/components/preferences/privacy.js
-@@ -1214,6 +1214,10 @@ var gPrivacyPane = {
-
- this.initWebAuthn();
-
-+ if (Services.prefs.getBoolPref("librewolf.hidePasswdmgr", false)) {
-+ document.getElementById("passwordsGroup")?.remove();
-+ }
-+
- // Notify observers that the UI is now ready
- Services.obs.notifyObservers(window, "privacy-pane-loaded");
- },
diff --git a/patches/include-policy-deletion.patch b/patches/include-policy-deletion.patch
new file mode 100644
index 000000000..b454eaaf3
--- /dev/null
+++ b/patches/include-policy-deletion.patch
@@ -0,0 +1,13 @@
+diff --git a/config/createprecomplete.py b/config/createprecomplete.py
+index 07139f2..8e80807 100644
+--- a/config/createprecomplete.py
++++ b/config/createprecomplete.py
+@@ -27,7 +27,7 @@ def get_build_entries(root_path):
+ or rel_path_file.startswith("ChannelPrefs.framework/")
+ or "/UpdateSettings.framework/" in rel_path_file
+ or rel_path_file.startswith("UpdateSettings.framework/")
+- or "distribution/" in rel_path_file
++ or ("distribution/" in rel_path_file and rel_path_file != "distribution/policies.json")
+ ):
+ rel_file_path_set.add(rel_path_file)
+
diff --git a/patches/lw-permissions.patch b/patches/lw-permissions.patch
index 6c0acdc3e..7681ad72e 100644
--- a/patches/lw-permissions.patch
+++ b/patches/lw-permissions.patch
@@ -1,8 +1,16 @@
diff --git a/browser/components/preferences/config/permissions-data.mjs b/browser/components/preferences/config/permissions-data.mjs
-index 8e0e6d5..6a937c5 100644
+index e25447b..432f6f3 100644
--- a/browser/components/preferences/config/permissions-data.mjs
+++ b/browser/components/preferences/config/permissions-data.mjs
-@@ -63,6 +63,11 @@ Preferences.addAll([
+@@ -11,6 +11,7 @@ const XPCOMUtils = ChromeUtils.importESModule(
+
+ const lazy = XPCOMUtils.declareLazy({
+ AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
++ SitePermissions: "resource:///modules/SitePermissions.sys.mjs",
+ SelectableProfileService:
+ "resource:///modules/profiles/SelectableProfileService.sys.mjs",
+ AlertsServiceDND: () => {
+@@ -63,6 +64,11 @@ Preferences.addAll([
{ id: PREF_ADDON_RECOMMENDATIONS_ENABLED, type: "bool" },
{ id: PREF_UPLOAD_ENABLED, type: "bool" },
{ id: "datareporting.usage.uploadEnabled", type: "bool" },
@@ -14,7 +22,7 @@ index 8e0e6d5..6a937c5 100644
]);
/**
-@@ -490,6 +495,45 @@ Preferences.addSetting(
+@@ -498,6 +504,67 @@ Preferences.addSetting(
})
);
@@ -32,10 +40,15 @@ index 8e0e6d5..6a937c5 100644
+});
+Preferences.addSetting({
+ id: "emeSettingsButton",
-+ onUserClick: () => showPermissionExceptions({ permissionType: "media-key-system-access" }),
++ onUserClick: () =>
++ showPermissionExceptions({ permissionType: "media-key-system-access" }),
+ deps: ["emeEnabled", "emePermissionPromptEnabled", "emeUIEnabled"],
+ visible: deps => {
-+ return deps.emeEnabled.value && deps.emePermissionPromptEnabled.value && deps.emeUIEnabled.value;
++ return (
++ deps.emeEnabled.value &&
++ deps.emePermissionPromptEnabled.value &&
++ deps.emeUIEnabled.value
++ );
+ },
+});
+
@@ -56,11 +69,28 @@ index 8e0e6d5..6a937c5 100644
+ },
+});
+
++Preferences.addSetting({
++ id: "canvasSettingsButton",
++ onUserClick: () => showPermissionExceptions({ permissionType: "canvas" }),
++ deps: [
++ "resistFingerprinting",
++ "etpCustomFingerprintingProtectionEnabled",
++ "fingerprintingProtectionOverrides",
++ "baselineFingerprintingProtectionEnabled",
++ "baselineFingerprintingProtectionOverrides",
++ ],
++ visible: deps => {
++ return (
++ deps.resistFingerprinting.value ||
++ lazy.SitePermissions._computeCanvasImageExtractionEnabled()
++ );
++ },
++});
+
SettingGroupManager.registerGroups({
permissions: {
id: "permissions",
-@@ -600,6 +644,26 @@ SettingGroupManager.registerGroups({
+@@ -607,6 +674,36 @@ SettingGroupManager.registerGroups({
"permissions-remove.label,permissions-remove-all.label,permissions-site-xr-window2.title,permissions-site-xr-desc,permissions-site-xr-disable-label,permissions-site-xr-disable-desc,",
},
},
@@ -69,12 +99,22 @@ index 8e0e6d5..6a937c5 100644
+ control: "moz-box-button",
+ l10nId: "permissions-webgl2",
+ controlAttrs: {
-+ ".iconSrc": "chrome://browser/skin/notification-icons/webgl.svg",
++ ".iconSrc": "chrome://browser/skin/webgl.svg",
+ "search-l10n-ids":
+ "permissions-remove.label,permissions-remove-all.label,permissions-site-webgl-window2.title,permissions-site-webgl-desc",
+ },
+ },
+ {
++ id: "canvasSettingsButton",
++ control: "moz-box-button",
++ l10nId: "permissions-canvas2",
++ controlAttrs: {
++ ".iconSrc": "chrome://browser/skin/canvas.svg",
++ "search-l10n-ids":
++ "permissions-remove.label,permissions-remove-all.label,permissions-site-canvas-window2.title,permissions-site-canvas-desc",
++ },
++ },
++ {
+ id: "emeSettingsButton",
+ control: "moz-box-button",
+ l10nId: "permissions-eme2",
@@ -112,10 +152,10 @@ index b23fc2bc15eb..b601c78e213c 100644
data-l10n-id="urlbar-indexed-db-notification-anchor"/>
Services.prefs.getBoolPref(
-# "librewolf.devHelpers", false)
-# browser/base/content/browser-main.js the same test, guarding the
-# loadSubScript of
-# browser-development-helpers.js
+# What is here (re-derived for Firefox 157 from upstream LibreWolf's
+# regenerated patches/moz-official.patch, the browser/ hunks taken verbatim):
+# browser/base/content/browser-development-helpers.js
+# DevelopmentHelpers.init() only binds
+# quickRestart and adds the shortcut when
+# Services.prefs.getBoolPref(
+# "librewolf.devHelpers", false)
+# browser/base/content/browser-main.js drops the !AppConstants.MOZILLA_OFFICIAL
+# guard: browser-development-helpers.js
+# is always loaded (the pref gate is
+# now inside init(), above)
+# browser/components/BrowserComponents.manifest
+# drops #ifndef MOZILLA_OFFICIAL /
+# #endif around the
+# browser-window-delayed-startup category
+# entry that calls DevelopmentHelpers.init
# browser/base/jar.mn drops the #ifndef MOZILLA_OFFICIAL /
# #endif around the packaging line for
# browser-development-helpers.js
#
+# History: up to Firefox 153 the init call was a hard-coded
+# `if (!AppConstants.MOZILLA_OFFICIAL) DevelopmentHelpers.init()` in
+# browser/base/content/browser-init.js, and this patch rewrote that test (and the
+# matching one in browser-main.js) to the pref. Firefox moved the call into a
+# BrowserComponents.manifest delayed-startup category, so the pref check moved
+# into init() itself. The behaviour is unchanged: helper off unless the pref is
+# true. References below to "the browser-init hunk" mean this init hook in either
+# shape.
+#
# Together these keep the upstream "local development" helper -- the
# accel+alt+R quick-restart command, key and File-menu item defined in
# browser/base/content/browser-development-helpers.js -- available in an
# official LibreWolf build, behind librewolf.devHelpers, which
# settings/librewolf.cfg:756 defaults to false.
#
-# Why it is desktop-only: all three files are under browser/.
+# Why it is desktop-only: all four files are under browser/.
# browser/app.mozbuild:11 (`DIRS += ["/browser"]`) is what pulls /browser into a
# build and mobile/android/app.mozbuild never does, so these files are not in an
# Android build at all and the hunks could not apply to one.
@@ -39,7 +57,7 @@
# The evidence:
#
# 1. DevelopmentHelpers exists nowhere else. `grep -rl "DevelopmentHelpers\|
-# development-helpers"` over the whole tree returns exactly six files: the
+# development-helpers"` over the whole 153 tree returned exactly six files: the
# three patched here, browser/base/content/browser-development-helpers.js
# itself, and two devtools files that only name it in a comment while
# reimplementing it --
@@ -93,32 +111,52 @@
# wants a quick-restart affordance it is new work in patches/android/, not a
# port of this hunk.
#
-diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
-index 288a79e..f0106ba 100644
---- a/browser/base/content/browser-init.js
-+++ b/browser/base/content/browser-init.js
-@@ -504,7 +504,7 @@ var gBrowserInit = {
- gDataNotificationInfoBar.init();
- }
+diff --git a/browser/base/content/browser-development-helpers.js b/browser/base/content/browser-development-helpers.js
+index 5155b28..8dea266 100644
+--- a/browser/base/content/browser-development-helpers.js
++++ b/browser/base/content/browser-development-helpers.js
+@@ -9,8 +9,10 @@
-- if (!AppConstants.MOZILLA_OFFICIAL) {
+ var DevelopmentHelpers = {
+ init() {
+- this.quickRestart = this.quickRestart.bind(this);
+- this.addRestartShortcut();
+ if (Services.prefs.getBoolPref("librewolf.devHelpers", false)) {
- DevelopmentHelpers.init();
- }
-
++ this.quickRestart = this.quickRestart.bind(this);
++ this.addRestartShortcut();
++ }
+ },
+
+ quickRestart() {
diff --git a/browser/base/content/browser-main.js b/browser/base/content/browser-main.js
-index d24bcbb..1c161f3 100644
+index 1ff101a..6b02e5a 100644
--- a/browser/base/content/browser-main.js
+++ b/browser/base/content/browser-main.js
-@@ -12,7 +12,7 @@
+@@ -11,9 +11,7 @@
if (AppConstants.MOZ_DATA_REPORTING) {
Services.scriptloader.loadSubScript("chrome://browser/content/browser-data-submission-info-bar.js", this);
}
- if (!AppConstants.MOZILLA_OFFICIAL) {
-+ if (Services.prefs.getBoolPref("librewolf.devHelpers", false)) {
- Services.scriptloader.loadSubScript("chrome://browser/content/browser-development-helpers.js", this);
- }
+- Services.scriptloader.loadSubScript("chrome://browser/content/browser-development-helpers.js", this);
+- }
++ Services.scriptloader.loadSubScript("chrome://browser/content/browser-development-helpers.js", this);
Services.scriptloader.loadSubScript("chrome://browser/content/browser-pageActions.js", this);
+ Services.scriptloader.loadSubScript("chrome://browser/content/sidebar/browser-sidebar.js", this);
+ Services.scriptloader.loadSubScript("chrome://browser/content/browser-customtitlebar.js", this);
+diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest
+index 17f4eaf..988d852 100644
+--- a/browser/components/BrowserComponents.manifest
++++ b/browser/components/BrowserComponents.manifest
+@@ -86,9 +86,7 @@ category browser-window-delayed-startup chrome://browser/content/browser-fullScr
+ #ifdef MOZ_DATA_REPORTING
+ category browser-window-delayed-startup chrome://browser/content/browser-data-submission-info-bar.js gDataNotificationInfoBar.init
+ #endif
+-#ifndef MOZILLA_OFFICIAL
+ category browser-window-delayed-startup chrome://browser/content/browser-development-helpers.js DevelopmentHelpers.init
+-#endif
+ category browser-window-delayed-startup chrome://browser/content/browser-addons.js gExtensionsNotifications.init
+ category browser-window-delayed-startup chrome://browser/content/browser-captivePortal.js CaptivePortalWatcher.delayedStartup
+
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 22550de..470b23f 100644
--- a/browser/base/jar.mn
diff --git a/patches/msix.patch b/patches/msix.patch
index 23518bd78..b25dc2911 100644
--- a/patches/msix.patch
+++ b/patches/msix.patch
@@ -80,7 +80,7 @@
# ---------------------------------------------------------------------------
diff --git a/browser/installer/windows/msix/AppxManifest.xml.in b/browser/installer/windows/msix/AppxManifest.xml.in
-index b81a73518a..3e58515c5d 100644
+index 9bb9133..1d63bec 100644
--- a/browser/installer/windows/msix/AppxManifest.xml.in
+++ b/browser/installer/windows/msix/AppxManifest.xml.in
@@ -30,13 +30,14 @@
@@ -99,11 +99,10 @@ index b81a73518a..3e58515c5d 100644
+@@ -138,19 +139,5 @@
+ ThreadingModel="MTA" />
+
+
-
-
-
@@ -118,7 +117,7 @@ index b81a73518a..3e58515c5d 100644
- ProxyStubClsid="1814ceeb-49e2-407f-af99-fa755a7d2607" />
-
-
--
+
diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
index 58702a0734..08d7862509 100644
diff --git a/patches/mullvad-dns-migration.patch b/patches/mullvad-dns-migration.patch
new file mode 100644
index 000000000..4c4d08cb6
--- /dev/null
+++ b/patches/mullvad-dns-migration.patch
@@ -0,0 +1,106 @@
+# Adapted from https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/merge_requests/263
+diff --git a/browser/base/content/browser-main.js b/browser/base/content/browser-main.js
+index 1ff101a..5e902fc 100644
+--- a/browser/base/content/browser-main.js
++++ b/browser/base/content/browser-main.js
+@@ -31,6 +31,7 @@
+ Services.scriptloader.loadSubScript("chrome://browser/content/places/places-menupopup.js", this);
+ Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this);
+ Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
++ Services.scriptloader.loadSubScript("chrome://browser/content/mullvadDoHNotification.js", this);
+ if (AIWindow.isOpeningAIWindow(window)) {
+ ChromeUtils.importESModule("chrome://browser/content/urlbar/SmartbarInput.mjs", { global: "current" });
+ }
+diff --git a/browser/base/content/mullvadDoHNotification.js b/browser/base/content/mullvadDoHNotification.js
+new file mode 100644
+index 0000000..6295c42
+--- /dev/null
++++ b/browser/base/content/mullvadDoHNotification.js
+@@ -0,0 +1,56 @@
++"use strict";
++
++window.addEventListener("load", () => {
++ // A notification to let users known that their DNS over HTTPS
++ // provider is being discontinued.
++ const notification = {
++ // ProfileDataUpgrader.upgradeMB migration will set the `showPref`
++ // preference conditionally on whether the user is affected. We wait for
++ // this preference for confirmation.
++ showPref: "librewolf.migration.show_doh_notification",
++ shown: false,
++
++ init() {
++ Services.prefs.addObserver(this.showPref, this);
++ this.maybeShow();
++ },
++
++ observe() {
++ this.maybeShow();
++ },
++
++ async maybeShow() {
++ if (this.shown || !Services.prefs.getBoolPref(this.showPref, false)) {
++ return;
++ }
++ this.shown = true;
++ Services.prefs.removeObserver(this.showPref, this);
++
++ gNotificationBox.appendNotification(
++ "mullvad-doh-notification",
++ {
++ label: { "l10n-id": "mullvad-doh-notification-body" },
++ priority: gNotificationBox.PRIORITY_INFO_HIGH,
++ },
++ [
++ {
++ "l10n-id": "moz-support-link-text",
++ link: "https://mullvad.net/en/blog/shutting-down-our-public-encrypted-dns-servers-and-sponsoring-quad9-instead",
++ },
++ {
++ "l10n-id": "mullvad-doh-notification-settings-button",
++ primary: true,
++ callback: () => {
++ window.openPreferences("privacy-doh");
++ Services.prefs.clearUserPref(this.showPref);
++ // Keep the notification open in case the user wants to click
++ // "Learn more".
++ return true;
++ },
++ },
++ ]
++ );
++ },
++ };
++ notification.init();
++});
+diff --git a/browser/base/jar.mn b/browser/base/jar.mn
+index 783c67d..071f294 100644
+--- a/browser/base/jar.mn
++++ b/browser/base/jar.mn
+@@ -101,6 +101,7 @@ browser.jar:
+ content/browser/spotlight.html (content/spotlight.html)
+ content/browser/spotlight.js (content/spotlight.js)
+ * content/browser/default-bookmarks.html (content/default-bookmarks.html)
++ content/browser/mullvadDoHNotification.js (content/mullvadDoHNotification.js)
+
+ # L10n resources and overrides.
+ % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
+diff --git a/browser/components/ProfileDataUpgrader.sys.mjs b/browser/components/ProfileDataUpgrader.sys.mjs
+index 6cee3dc..f12514e 100644
+--- a/browser/components/ProfileDataUpgrader.sys.mjs
++++ b/browser/components/ProfileDataUpgrader.sys.mjs
+@@ -1139,6 +1139,14 @@ export let ProfileDataUpgrader = {
+
+ // We need to override this in order to roll the new sidebar out to everyone
+ Services.prefs.clearUserPref("sidebar.revamp");
++
++ const DOH_NOTIFICATION_PREF = "librewolf.migration.show_doh_notification";
++ const DOH_URI_PREF = "network.trr.uri";
++ const MULLVAD_DNS = "https://dns.mullvad.net/dns-query";
++
++ if (Services.prefs.getStringPref(DOH_URI_PREF, "") === MULLVAD_DNS) {
++ Services.prefs.setBoolPref(DOH_NOTIFICATION_PREF, true);
++ }
+ }
+
+ // Update the migration version.
diff --git a/patches/newtab-fix.patch b/patches/newtab-fix.patch
index 7b38db21e..1153de008 100644
--- a/patches/newtab-fix.patch
+++ b/patches/newtab-fix.patch
@@ -1,12 +1,27 @@
-diff --git a/browser/modules/AboutNewTab.sys.mjs b/browser/modules/AboutNewTab.sys.mjs
-index 66ec2a2..79e4615 100644
---- a/browser/modules/AboutNewTab.sys.mjs
-+++ b/browser/modules/AboutNewTab.sys.mjs
-@@ -195,7 +195,6 @@ export const AboutNewTab = {
+diff --git a/toolkit/components/nimbus/ExperimentAPI.sys.mjs b/toolkit/components/nimbus/ExperimentAPI.sys.mjs
+index 681c72b7ff..5e8d70485f 100644
+--- a/toolkit/components/nimbus/ExperimentAPI.sys.mjs
++++ b/toolkit/components/nimbus/ExperimentAPI.sys.mjs
+@@ -549,11 +549,21 @@ export const ExperimentAPI = new (class {
+ * and doing so breaks a lot of tests due to enabling the
+ * RemoteSettingsExperimentLoader et al.
+ *
++ * Resolves immediately if Nimbus is disabled and initialization has not started.
++ *
+ * @returns {Promise}
+ * A promise that resolves when the API has synchronized to the main
+- * store
++ * store, or immediately when Nimbus is disabled.
+ */
+ async ready() {
++ if (!this.#initializedPromise) {
++ this.#computeEnabled();
++
++ if (!this.enabled) {
++ return Promise.resolve();
++ }
++ }
++
+ return this.manager.store.ready();
+ }
- const [createdTimestamp] = await Promise.all([
- profileCreatedAccessorReady,
-- trainhopFeatureReady,
- addonInitted,
- ]);
- const createdInstant = createdTimestamp
diff --git a/patches/pip-hide-ui.patch b/patches/pip-hide-ui.patch
new file mode 100644
index 000000000..49282cd72
--- /dev/null
+++ b/patches/pip-hide-ui.patch
@@ -0,0 +1,106 @@
+diff --git a/toolkit/themes/shared/pictureinpicture/player.css b/toolkit/themes/shared/pictureinpicture/player.css
+index 72b016f..7a5fd66 100644
+--- a/toolkit/themes/shared/pictureinpicture/player.css
++++ b/toolkit/themes/shared/pictureinpicture/player.css
+@@ -222,6 +222,8 @@ body:not(:fullscreen) #controls:hover .control-button:disabled {
+ bottom: -3em;
+ }
+
++#piphide:focus-visible::after,
++#piphide:hover::after,
+ #close:focus-visible::after,
+ #close:hover::after,
+ #unpip[mac="true"]:focus-visible::after,
+@@ -230,6 +232,8 @@ body:not(:fullscreen) #controls:hover .control-button:disabled {
+ transform: translateX(1em);
+ }
+
++#piphide[mac="true"]:focus-visible::after,
++#piphide[mac="true"]:hover::after,
+ #unpip:focus-visible::after,
+ #unpip:hover::after,
+ #close[mac="true"]:focus-visible::after,
+@@ -305,6 +309,7 @@ body:not(:fullscreen) #controls:hover #timestamp {
+ opacity: 1;
+ }
+
++#piphide,
+ #close,
+ #unpip {
+ background-color: rgba(255, 255, 255, 0.8);
+@@ -312,11 +317,23 @@ body:not(:fullscreen) #controls:hover #timestamp {
+ fill: var(--close-btn-fill-color);
+ }
+
++#piphide:is(:hover, :focus-visible),
+ #close:is(:hover, :focus-visible),
+ #unpip:is(:hover, :focus-visible) {
+ background-color: rgba(255, 255, 255, 0.9);
+ }
+
++#piphide {
++ background-image: url("chrome://global/skin/icons/eye-slash.svg");
++ right: 50px;
++ top: 10px;
++}
++
++#piphide[mac="true"] {
++ right: auto;
++ left: 50px;
++}
++
+ #close {
+ background-image: url("chrome://global/skin/icons/close.svg");
+ right: 10px;
+diff --git a/toolkit/components/pictureinpicture/content/player.xhtml b/toolkit/components/pictureinpicture/content/player.xhtml
+index a723bc5..96a2c94 100644
+--- a/toolkit/components/pictureinpicture/content/player.xhtml
++++ b/toolkit/components/pictureinpicture/content/player.xhtml
+@@ -51,13 +51,22 @@
+ tabindex="9"
+ #else
+ tabindex="10"
++#endif
++ />
++
+
third_party/perfetto/third_party/rust/calendrical_calculationstoolkit/components/ml/vendor/openai/dist/openai.mjstoolkit/components/ml/vendor/transformers.jstoolkit/components/ml/vendor/transformers-dev.jstoolkit/components/ml/vendor/openai/dist/openai-dev.mjs