Bug 962511 - Add missing MOZ_INSTRUMENT_EVENT_LOOP ifdef to nsAppShellService.cpp. r=ehsan
authorOleg Romashin <romaxa@gmail.com>
Wed, 12 Feb 2014 10:33:43 -0500
changeset 185597 5f73ed4576074a224fe605762b16dc061071413c
parent 185596 c603a26dd2ad41d8ceb096abedfad2d65b1dbef1
child 185598 6cd04a76fa13688055b8ced47854f7dfc9fcac9e
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs962511
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 962511 - Add missing MOZ_INSTRUMENT_EVENT_LOOP ifdef to nsAppShellService.cpp. r=ehsan
xpfe/appshell/src/nsAppShellService.cpp
--- a/xpfe/appshell/src/nsAppShellService.cpp
+++ b/xpfe/appshell/src/nsAppShellService.cpp
@@ -41,17 +41,19 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/StartupTimeline.h"
 
 #include "nsEmbedCID.h"
 #include "nsIWebBrowser.h"
 #include "nsIDocShell.h"
 
+#ifdef MOZ_INSTRUMENT_EVENT_LOOP
 #include "EventTracer.h"
+#endif
 
 using namespace mozilla;
 
 // Default URL for the hidden window, can be overridden by a pref on Mac
 #define DEFAULT_HIDDENWINDOW_URL "resource://gre-resources/hiddenWindow.html"
 
 class nsIAppShell;
 
@@ -867,18 +869,22 @@ nsAppShellService::Observe(nsISupports* 
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsAppShellService::StartEventLoopLagTracking(bool* aResult)
 {
+#ifdef MOZ_INSTRUMENT_EVENT_LOOP
     *aResult = mozilla::InitEventTracing(true);
+#endif
     return NS_OK;
 }
 
 NS_IMETHODIMP
 nsAppShellService::StopEventLoopLagTracking()
 {
+#ifdef MOZ_INSTRUMENT_EVENT_LOOP
     mozilla::ShutdownEventTracing();
+#endif
     return NS_OK;
 }