summaryrefslogtreecommitdiffstats
path: root/toolkit/xre
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 05:43:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 05:43:14 +0000
commit8dd16259287f58f9273002717ec4d27e97127719 (patch)
tree3863e62a53829a84037444beab3abd4ed9dfc7d0 /toolkit/xre
parentReleasing progress-linux version 126.0.1-1~progress7.99u1. (diff)
downloadfirefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz
firefox-8dd16259287f58f9273002717ec4d27e97127719.zip
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/xre')
-rw-r--r--toolkit/xre/dllservices/UntrustedModulesProcessor.cpp8
-rw-r--r--toolkit/xre/dllservices/UntrustedModulesProcessor.h2
-rw-r--r--toolkit/xre/nsAppRunner.cpp9
3 files changed, 7 insertions, 12 deletions
diff --git a/toolkit/xre/dllservices/UntrustedModulesProcessor.cpp b/toolkit/xre/dllservices/UntrustedModulesProcessor.cpp
index 1d11837355..35dd814acd 100644
--- a/toolkit/xre/dllservices/UntrustedModulesProcessor.cpp
+++ b/toolkit/xre/dllservices/UntrustedModulesProcessor.cpp
@@ -409,7 +409,7 @@ RefPtr<ModulesTrustPromise> UntrustedModulesProcessor::GetModulesTrust(
RefPtr<ModulesTrustPromise::Private> p(
new ModulesTrustPromise::Private(__func__));
nsCOMPtr<nsISerialEventTarget> evtTarget(mThread);
- const char* source = __func__;
+ StaticString source = __func__;
auto runWrap = [evtTarget = std::move(evtTarget), p, source,
run = std::move(run)]() mutable -> void {
@@ -441,7 +441,7 @@ UntrustedModulesProcessor::GetProcessedDataInternal() {
}
RefPtr<UntrustedModulesPromise> UntrustedModulesProcessor::GetAllProcessedData(
- const char* aSource) {
+ StaticString aSource) {
AssertRunningOnLazyIdleThread();
UntrustedModulesData result;
@@ -471,7 +471,7 @@ UntrustedModulesProcessor::GetProcessedDataInternalChildProcess() {
new UntrustedModulesPromise::Private(__func__));
nsCOMPtr<nsISerialEventTarget> evtTarget(mThread);
- const char* source = __func__;
+ StaticString source = __func__;
auto completionRoutine = [evtTarget = std::move(evtTarget), p,
self = std::move(self), source,
whenProcessed = std::move(whenProcessed)]() {
@@ -570,7 +570,7 @@ void UntrustedModulesProcessor::BackgroundProcessModuleLoadQueueChildProcess() {
RefPtr<UntrustedModulesProcessor> self(this);
nsCOMPtr<nsISerialEventTarget> evtTarget(mThread);
- const char* source = __func__;
+ constexpr StaticString const source = __func__;
auto completionRoutine = [evtTarget = std::move(evtTarget),
self = std::move(self), source,
whenProcessed = std::move(whenProcessed)]() {
diff --git a/toolkit/xre/dllservices/UntrustedModulesProcessor.h b/toolkit/xre/dllservices/UntrustedModulesProcessor.h
index b91d88961a..3af6eab923 100644
--- a/toolkit/xre/dllservices/UntrustedModulesProcessor.h
+++ b/toolkit/xre/dllservices/UntrustedModulesProcessor.h
@@ -149,7 +149,7 @@ class UntrustedModulesProcessor final : public nsIObserver,
Priority aPriority);
void CompleteProcessing(ModulesMapResultWithLoads&& aModulesAndLoads);
- RefPtr<UntrustedModulesPromise> GetAllProcessedData(const char* aSource);
+ RefPtr<UntrustedModulesPromise> GetAllProcessedData(StaticString aSource);
private:
RefPtr<LazyIdleThread> mThread;
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 35c58d9b36..2145fe39fd 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -784,11 +784,6 @@ nsIXULRuntime::ContentWin32kLockdownState GetLiveWin32kLockdownState() {
}
}
- // Non-native theming is required as well
- if (!StaticPrefs::widget_non_native_theme_enabled()) {
- return nsIXULRuntime::ContentWin32kLockdownState::MissingNonNativeTheming;
- }
-
// Win32k Lockdown requires Remote WebGL, but it may be disabled on
// certain hardware or virtual machines.
if (!gfx::gfxVars::AllowWebglOop() || !StaticPrefs::webgl_out_of_process()) {
@@ -2635,8 +2630,8 @@ static nsresult ProfileMissingDialog(nsINativeAppSupport* aNative) {
# ifdef MOZ_BACKGROUNDTASKS
if (BackgroundTasks::IsBackgroundTaskMode()) {
// We should never get to this point in background task mode.
- Output(false,
- "Could not determine any profile running in backgroundtask mode!\n");
+ printf_stderr(
+ "Could not determine any profile running in backgroundtask mode!\n");
return NS_ERROR_ABORT;
}
# endif // MOZ_BACKGROUNDTASKS