Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2022-04-21 21:59:16 +08:00
commit 059e35a463
32 changed files with 77 additions and 150 deletions

View file

@ -21,7 +21,7 @@
#include "mozilla/ipc/Faulty.h"
#endif
#if !defined(RELEASE_OR_BETA) || defined(DEBUG)
#if defined(DEBUG)
#define MOZ_PICKLE_SENTINEL_CHECKING
#endif

View file

@ -45,11 +45,7 @@
#include "nsXPCOMPrivate.h"
#include "prthread.h"
#ifdef RELEASE_OR_BETA
#define THREADSAFETY_ASSERT MOZ_ASSERT
#else
#define THREADSAFETY_ASSERT MOZ_RELEASE_ASSERT
#endif
#define CRASH_IN_CHILD_PROCESS(_msg) \
do { \
@ -331,7 +327,7 @@ class ChildImpl final : public BackgroundChildImpl
// create the background thread after application shutdown has started.
static bool sShutdownHasStarted;
#if defined(DEBUG) || !defined(RELEASE_OR_BETA)
#if defined(DEBUG)
nsIThread* mBoundThread;
#endif
@ -351,11 +347,7 @@ public:
{
THREADSAFETY_ASSERT(mBoundThread);
#ifdef RELEASE_OR_BETA
DebugOnly<bool> current;
#else
bool current;
#endif
THREADSAFETY_ASSERT(
NS_SUCCEEDED(mBoundThread->IsOnCurrentThread(&current)));
THREADSAFETY_ASSERT(current);
@ -368,7 +360,7 @@ public:
}
ChildImpl()
#if defined(DEBUG) || !defined(RELEASE_OR_BETA)
#if defined(DEBUG)
: mBoundThread(nullptr)
#endif
#ifdef DEBUG
@ -449,7 +441,7 @@ private:
{
THREADSAFETY_ASSERT(!mBoundThread);
#if defined(DEBUG) || !defined(RELEASE_OR_BETA)
#if defined(DEBUG)
mBoundThread = NS_GetCurrentThread();
#endif