Merging upstream version 127.0.

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

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