зеркало из https://github.com/mozilla/gecko-dev.git
Bug 910074 - Move crash reporter annotations added in bug 867530 after both SetExceptionHandler call and xpcom initialization. r=ted
This commit is contained in:
Родитель
92e924b5b5
Коммит
bd14f3f254
|
@ -925,10 +925,6 @@ nsXULAppInfo::SetEnabled(bool aEnabled)
|
||||||
if (!xreDirectory)
|
if (!xreDirectory)
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_FAILURE;
|
||||||
}
|
}
|
||||||
AnnotateCrashReport(NS_LITERAL_CSTRING("FramePoisonBase"),
|
|
||||||
nsPrintfCString("%.16llx", uint64_t(gMozillaPoisonBase)));
|
|
||||||
AnnotateCrashReport(NS_LITERAL_CSTRING("FramePoisonSize"),
|
|
||||||
nsPrintfCString("%lu", uint32_t(gMozillaPoisonSize)));
|
|
||||||
return CrashReporter::SetExceptionHandler(xreDirectory, true);
|
return CrashReporter::SetExceptionHandler(xreDirectory, true);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -3669,6 +3665,11 @@ XREMain::XRE_mainRun()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Needs to be set after xpcom initialization.
|
||||||
|
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("FramePoisonBase"),
|
||||||
|
nsPrintfCString("%.16llx", uint64_t(gMozillaPoisonBase)));
|
||||||
|
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("FramePoisonSize"),
|
||||||
|
nsPrintfCString("%lu", uint32_t(gMozillaPoisonSize)));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (mStartOffline) {
|
if (mStartOffline) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче