From ac282b5848d90db100955fee6ce47745f67e0f40 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 04:30:12 +0200 Subject: Merging upstream version 115.9.0esr. Signed-off-by: Daniel Baumann --- toolkit/crashreporter/nsExceptionHandler.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'toolkit/crashreporter/nsExceptionHandler.h') diff --git a/toolkit/crashreporter/nsExceptionHandler.h b/toolkit/crashreporter/nsExceptionHandler.h index 1212ae2e51..d79996244a 100644 --- a/toolkit/crashreporter/nsExceptionHandler.h +++ b/toolkit/crashreporter/nsExceptionHandler.h @@ -173,24 +173,20 @@ nsresult AppendObjCExceptionInfoToAppNotes(void* inException); nsresult GetSubmitReports(bool* aSubmitReport); nsresult SetSubmitReports(bool aSubmitReport); -// Out-of-process crash reporter API. - #ifdef XP_WIN // This data is stored in the parent process, there is one copy for each child // process. The mChildPid and mMinidumpFile fields are filled by the WER runtime // exception module when the associated child process crashes. struct WindowsErrorReportingData { - // Points to the WerNotifyProc function. - LPTHREAD_START_ROUTINE mWerNotifyProc; // PID of the child process that crashed. DWORD mChildPid; // Filename of the generated minidump; this is not a 0-terminated string char mMinidumpFile[40]; - // OOM allocation size for the crash (ignore if zero) - size_t mOOMAllocationSize; }; #endif // XP_WIN +// Out-of-process crash reporter API. + // Initializes out-of-process crash reporting. This method must be called // before the platform-specific notification pipe APIs are called. If called // from off the main thread, this method will synchronously proxy to the main @@ -319,11 +315,6 @@ bool CreateNotificationPipeForChild(int* childCrashFd, int* childCrashRemapFd); #endif // XP_WIN -// Windows Error Reporting helper -#if defined(XP_WIN) -DWORD WINAPI WerNotifyProc(LPVOID aParameter); -#endif - // Child-side API bool SetRemoteExceptionHandler( const char* aCrashPipe = nullptr, -- cgit v1.2.3