From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs | 3 +-- toolkit/components/asyncshutdown/nsIAsyncShutdown.idl | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'toolkit/components/asyncshutdown') diff --git a/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs b/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs index 4f0adc092a..4577fa49a4 100644 --- a/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs +++ b/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs @@ -335,8 +335,7 @@ function getOrigin(topFrame, filename = null, lineNumber = null, stack = null) { lineNumber = frame ? frame.lineNumber : 0; } if (stack == null) { - // Now build the rest of the stack as a string, using Task.jsm's rewriting - // to ensure that we do not lose information at each call to `Task.spawn`. + // Now build the rest of the stack as a string. stack = []; while (frame != null) { stack.push(frame.filename + ":" + frame.name + ":" + frame.lineNumber); diff --git a/toolkit/components/asyncshutdown/nsIAsyncShutdown.idl b/toolkit/components/asyncshutdown/nsIAsyncShutdown.idl index 945772bd51..a40d343836 100644 --- a/toolkit/components/asyncshutdown/nsIAsyncShutdown.idl +++ b/toolkit/components/asyncshutdown/nsIAsyncShutdown.idl @@ -223,7 +223,3 @@ interface nsIAsyncShutdownService: nsISupports { // makes it easier to cause shutdown hangs. }; - -%{C++ -#define NS_ASYNCSHUTDOWNSERVICE_CONTRACTID "@mozilla.org/async-shutdown-service;1" -%} -- cgit v1.2.3