mozilla-central: changeset 173428:1fe2943ce1e3087eaccb5ce234fc240072ad0f31

author	Jim Chen <nchen@mozilla.com>
	Thu, 13 Mar 2014 12:17:42 -0400
changeset 173428	1fe2943ce1e3087eaccb5ce234fc240072ad0f31
parent 173427	93aefdb374e7ce22d2ba91656096a95d2de655b9
child 173429	e522b5f583eebf07c5ed560856250150f208b4f3
push id	26403
push user	ryanvm@gmail.com
push date	Thu, 13 Mar 2014 19:32:04 +0000
treeherder	mozilla-central@fe40387eba1a [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	froydnj
bugs	979069
milestone	30.0a1
first release with	nightly linux32 f073b3d6db1f / 30.0a1 / 20140314030202 / files nightly linux64 f073b3d6db1f / 30.0a1 / 20140314030202 / files nightly mac f073b3d6db1f / 30.0a1 / 20140314030202 / files nightly win32 f073b3d6db1f / 30.0a1 / 20140314030202 / files nightly win64 f073b3d6db1f / 30.0a1 / 20140314030202 / files
last release without	nightly linux32 46041cc216fd / 30.0a1 / 20140313030202 / files nightly linux64 46041cc216fd / 30.0a1 / 20140313030202 / files nightly mac 46041cc216fd / 30.0a1 / 20140313030202 / files nightly win32 46041cc216fd / 30.0a1 / 20140313030202 / files nightly win64 46041cc216fd / 30.0a1 / 20140313030202 / files

--- a/xpcom/threads/BackgroundHangMonitor.h
+++ b/xpcom/threads/BackgroundHangMonitor.h
@@ -12,17 +12,19 @@
 #include <stdint.h>
 
 namespace mozilla {
 
 namespace Telemetry {
 class ThreadHangStats;
 };
 
-#ifndef RELEASE_BUILD
+// Disabled for Beta/Release builds because of bug 965392.
+// Disabled for debug builds because of bug 979069.
+#if !defined(RELEASE_BUILD) && !defined(DEBUG)
 // Undefine to disable background hang monitor
 #define MOZ_ENABLE_BACKGROUND_HANG_MONITOR
 #endif
 
 class BackgroundHangThread;
 
 /**
  * The background hang monitor is responsible for detecting and reporting