Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1402519 - Remove MOZ_CRASHREPORTER directives from js; r=nbp

Browse Source 
MozReview-Commit-ID: DPa3IW4nwlM

--HG--
extra : rebase_source : c48dbb8144dfd501a193d8117a265d968ca2790b
This commit is contained in:
Gabriele Svelto 2017-10-10 12:10:33 +02:00
parent ef3b2f88cc
commit 84827e1a1e
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/xpconnect/src/XPCJSRuntime.cpp
View File

@ -18,6 +18,7 @@
#include "nsAutoPtr.h"
#include "nsNetUtil.h"
#include "nsExceptionHandler.h"
#include "nsIMemoryInfoDumper.h"
#include "nsIMemoryReporter.h"
#include "nsIObserverService.h"
@ -60,10 +61,6 @@
#include "nsIXULRuntime.h"
#include "nsJSPrincipals.h"
#ifdef MOZ_CRASHREPORTER
#include "nsExceptionHandler.h"
#endif
#ifdef XP_WIN
#include <windows.h>
#endif
@ -752,9 +749,7 @@ XPCJSRuntime::GCSliceCallback(JSContext* cx,
if (!self)
return;
#ifdef MOZ_CRASHREPORTER
CrashReporter::SetGarbageCollecting(progress == JS::GC_CYCLE_BEGIN);
#endif
if (self->mPrevGCSliceCallback)
(*self->mPrevGCSliceCallback)(cx, progress, desc);

13
js/xpconnect/src/XPCShellImpl.cpp
View File

@ -13,6 +13,7 @@
#include "mozilla/Preferences.h"
#include "nsServiceManagerUtils.h"
#include "nsComponentManagerUtils.h"
#include "nsExceptionHandler.h"
#include "nsIServiceManager.h"
#include "nsIFile.h"
#include "nsString.h"
@ -61,11 +62,6 @@
#include <unistd.h> /* for isatty() */
#endif
#ifdef MOZ_CRASHREPORTER
#include "nsExceptionHandler.h"
#include "nsICrashReporter.h"
#endif
#ifdef ENABLE_TESTS
#include "xpctest_private.h"
#endif
@ -1193,7 +1189,6 @@ XRE_XPCShellMain(int argc, char** argv, char** envp,
argv += 2;
}
#ifdef MOZ_CRASHREPORTER
const char* val = getenv("MOZ_CRASHREPORTER");
if (val && *val && !CrashReporter::IsDummy()) {
rv = CrashReporter::SetExceptionHandler(greDir, true);
@ -1203,7 +1198,6 @@ XRE_XPCShellMain(int argc, char** argv, char** envp,
}
MOZ_ASSERT(CrashReporter::GetEnabled());
}
#endif
if (argc > 1 && !strcmp(argv[1], "--greomni")) {
nsCOMPtr<nsIFile> greOmni;
@ -1395,11 +1389,10 @@ XRE_XPCShellMain(int argc, char** argv, char** envp,
rv = NS_ShutdownXPCOM( nullptr );
MOZ_ASSERT(NS_SUCCEEDED(rv), "NS_ShutdownXPCOM failed");
#ifdef MOZ_CRASHREPORTER
// Shut down the crashreporter service to prevent leaking some strings it holds.
if (CrashReporter::GetEnabled())
if (CrashReporter::GetEnabled()) {
CrashReporter::UnsetExceptionHandler();
#endif
}
#ifdef MOZ_GECKO_PROFILER
// This must precede NS_LogTerm(), otherwise xpcshell return non-zero