From 6ed726f19a4ff6faa8afc44ec804d90cbf7f6938 Mon Sep 17 00:00:00 2001
From: Aaron Klotz <aklotz@mozilla.com>
Date: Wed, 22 Oct 2014 12:39:27 -0600
Subject: [PATCH] Bug 1087410: Ensure that ChromeHang annotations don't break
 in e10s; r=jimm

---
 xpcom/threads/HangMonitor.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xpcom/threads/HangMonitor.cpp b/xpcom/threads/HangMonitor.cpp
index cc5303695f9d..58805c567559 100644
--- a/xpcom/threads/HangMonitor.cpp
+++ b/xpcom/threads/HangMonitor.cpp
@@ -589,6 +589,9 @@ void
 RegisterAnnotator(Annotator& aAnnotator)
 {
 #ifdef REPORT_CHROME_HANGS
+  if (GeckoProcessType_Default != XRE_GetProcessType()) {
+    return;
+  }
   MonitorAutoLock lock(*gMonitor);
   MOZ_ASSERT(gAnnotators);
   gAnnotators->insert(&aAnnotator);
@@ -599,6 +602,9 @@ void
 UnregisterAnnotator(Annotator& aAnnotator)
 {
 #ifdef REPORT_CHROME_HANGS
+  if (GeckoProcessType_Default != XRE_GetProcessType()) {
+    return;
+  }
   MonitorAutoLock lock(*gMonitor);
   MOZ_ASSERT(gAnnotators);
   gAnnotators->erase(&aAnnotator);