mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-09-20 21:50:21 +02:00
Leah Rowe
113 lines
5.3 KiB
Diff
113 lines
5.3 KiB
Diff
From 301f96eacf384fb2c83b29e75370f198f12dc21c Mon Sep 17 00:00:00 2001
|
|
From: LibreWolf Developers <noreply@librewolf.net>
|
|
Date: Sun, 6 Sep 2026 10:10:36 +0100
|
|
Subject: [PATCH 22/52] moz-official.patch
|
|
|
|
---
|
|
browser/base/content/browser-development-helpers.js | 6 ++++--
|
|
browser/base/content/browser-main.js | 4 +---
|
|
browser/base/jar.mn | 2 --
|
|
browser/components/BrowserComponents.manifest | 2 --
|
|
dom/media/gmp/ChromiumCDMAdapter.cpp | 4 ++--
|
|
media/gmp-clearkey/0.1/gmp-clearkey.cpp | 2 +-
|
|
6 files changed, 8 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/browser/base/content/browser-development-helpers.js b/browser/base/content/browser-development-helpers.js
|
|
index 5155b280b8ff..8dea266fbde5 100644
|
|
--- a/browser/base/content/browser-development-helpers.js
|
|
+++ b/browser/base/content/browser-development-helpers.js
|
|
@@ -9,8 +9,10 @@
|
|
|
|
var DevelopmentHelpers = {
|
|
init() {
|
|
- this.quickRestart = this.quickRestart.bind(this);
|
|
- this.addRestartShortcut();
|
|
+ if (Services.prefs.getBoolPref("librewolf.devHelpers", false)) {
|
|
+ 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 1ff101aecefc..6b02e5acb177 100644
|
|
--- a/browser/base/content/browser-main.js
|
|
+++ b/browser/base/content/browser-main.js
|
|
@@ -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) {
|
|
- 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/base/jar.mn b/browser/base/jar.mn
|
|
index 783c67d397a5..b280fc60f01b 100644
|
|
--- a/browser/base/jar.mn
|
|
+++ b/browser/base/jar.mn
|
|
@@ -41,9 +41,7 @@ browser.jar:
|
|
content/browser/browser-context.js (content/browser-context.js)
|
|
content/browser/browser-customization.js (content/browser-customization.js)
|
|
content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
|
|
-#ifndef MOZILLA_OFFICIAL
|
|
content/browser/browser-development-helpers.js (content/browser-development-helpers.js)
|
|
-#endif
|
|
content/browser/browser-fullScreenAndPointerLock.js (content/browser-fullScreenAndPointerLock.js)
|
|
content/browser/browser-gestureSupport.js (content/browser-gestureSupport.js)
|
|
content/browser/browser-init.js (content/browser-init.js)
|
|
diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest
|
|
index 5fc75066310e..a184e735ce4b 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/dom/media/gmp/ChromiumCDMAdapter.cpp b/dom/media/gmp/ChromiumCDMAdapter.cpp
|
|
index 3afba39c6a92..0956a87b124f 100644
|
|
--- a/dom/media/gmp/ChromiumCDMAdapter.cpp
|
|
+++ b/dom/media/gmp/ChromiumCDMAdapter.cpp
|
|
@@ -68,7 +68,7 @@ void* ChromiumCdmHostCompat(int aHostInterfaceVersion, void* aUserData) {
|
|
return aUserData;
|
|
}
|
|
|
|
-#ifdef MOZILLA_OFFICIAL
|
|
+#if 0
|
|
static cdm::HostFile TakeToCDMHostFile(HostFileData& aHostFileData) {
|
|
return cdm::HostFile(aHostFileData.mBinary.Path().get(),
|
|
aHostFileData.mBinary.TakePlatformFile(),
|
|
@@ -84,7 +84,7 @@ GMPErr ChromiumCDMAdapter::GMPInit(const GMPPlatformAPI* aPlatformAPI) {
|
|
return GMPGenericErr;
|
|
}
|
|
|
|
-#ifdef MOZILLA_OFFICIAL
|
|
+#if 0
|
|
// Note: we must call the VerifyCdmHost_0 function if it's present before
|
|
// we call the initialize function.
|
|
auto verify = reinterpret_cast<decltype(::VerifyCdmHost_0)*>(
|
|
diff --git a/media/gmp-clearkey/0.1/gmp-clearkey.cpp b/media/gmp-clearkey/0.1/gmp-clearkey.cpp
|
|
index 95f8b1ff3f41..d30b13721fdc 100644
|
|
--- a/media/gmp-clearkey/0.1/gmp-clearkey.cpp
|
|
+++ b/media/gmp-clearkey/0.1/gmp-clearkey.cpp
|
|
@@ -72,7 +72,7 @@ void* CreateCdmInstance(int cdm_interface_version, const char* key_system,
|
|
return nullptr;
|
|
}
|
|
|
|
-#ifdef MOZILLA_OFFICIAL
|
|
+#if 0
|
|
// Test that we're able to read the host files.
|
|
if (!sCanReadHostVerificationFiles) {
|
|
return nullptr;
|
|
--
|
|
2.47.3
|
|
|