diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-03-30 08:50:58 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-03-30 08:50:58 +0200 |
| commit | 4e368f8199a61c6319621ad1b9d6c352f0319f41 (patch) | |
| tree | 69c6e2296c4e183ecbe6cfd1e856619e3715ae01 /dom/ipc/ProcessHangMonitor.cpp | |
| parent | 59bf4204a84f7638d3f89a29bc7c04e5dc401369 (diff) | |
| download | UXP-4e368f8199a61c6319621ad1b9d6c352f0319f41.tar UXP-4e368f8199a61c6319621ad1b9d6c352f0319f41.tar.gz UXP-4e368f8199a61c6319621ad1b9d6c352f0319f41.tar.lz UXP-4e368f8199a61c6319621ad1b9d6c352f0319f41.tar.xz UXP-4e368f8199a61c6319621ad1b9d6c352f0319f41.zip | |
Remove base conditional code for crash reporter and injector.
Diffstat (limited to 'dom/ipc/ProcessHangMonitor.cpp')
| -rw-r--r-- | dom/ipc/ProcessHangMonitor.cpp | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/dom/ipc/ProcessHangMonitor.cpp b/dom/ipc/ProcessHangMonitor.cpp index b574be61f..d46a1f5d5 100644 --- a/dom/ipc/ProcessHangMonitor.cpp +++ b/dom/ipc/ProcessHangMonitor.cpp @@ -27,9 +27,6 @@ #include "nsITabParent.h" #include "nsPluginHost.h" #include "nsThreadUtils.h" -#ifdef MOZ_CRASHREPORTER -#include "nsExceptionHandler.h" -#endif #include "base/task.h" #include "base/thread.h" @@ -556,16 +553,6 @@ HangMonitorParent::HangMonitorParent(ProcessHangMonitor* aMonitor) HangMonitorParent::~HangMonitorParent() { -#ifdef MOZ_CRASHREPORTER - MutexAutoLock lock(mBrowserCrashDumpHashLock); - - for (auto iter = mBrowserCrashDumpIds.Iter(); !iter.Done(); iter.Next()) { - nsString crashId = iter.UserData(); - if (!crashId.IsEmpty()) { - CrashReporter::DeleteMinidumpFilesForID(crashId); - } - } -#endif } void @@ -698,24 +685,6 @@ bool HangMonitorParent::TakeBrowserMinidump(const PluginHangData& aPhd, nsString& aCrashId) { -#ifdef MOZ_CRASHREPORTER - MutexAutoLock lock(mBrowserCrashDumpHashLock); - if (!mBrowserCrashDumpIds.Get(aPhd.pluginId(), &aCrashId)) { - nsCOMPtr<nsIFile> browserDump; - if (CrashReporter::TakeMinidump(getter_AddRefs(browserDump), true)) { - if (!CrashReporter::GetIDFromMinidump(browserDump, aCrashId) - || aCrashId.IsEmpty()) { - browserDump->Remove(false); - NS_WARNING("Failed to generate timely browser stack, " - "this is bad for plugin hang analysis!"); - } else { - mBrowserCrashDumpIds.Put(aPhd.pluginId(), aCrashId); - return true; - } - } - } -#endif // MOZ_CRASHREPORTER - return false; } @@ -840,11 +809,6 @@ HangMonitorParent::CleanupPluginHang(uint32_t aPluginId, bool aRemoveFiles) return; } mBrowserCrashDumpIds.Remove(aPluginId); -#ifdef MOZ_CRASHREPORTER - if (aRemoveFiles && !crashId.IsEmpty()) { - CrashReporter::DeleteMinidumpFilesForID(crashId); - } -#endif } void |