Backed out changeset e39a1f381b85 (bug 1329861) for failures in browser_webconsole_console_trace_async.js and browser_net_cause.js
authorPhil Ringnalda <philringnalda@gmail.com>
Mon, 09 Jan 2017 21:30:17 -0800
changeset 458382 5c27bf4d948a57f4cef3c34bb0b8225e2b65200a
parent 458381 e39a1f381b857108f1e412722e52c2ae054100c1
child 458383 92b3a12591d1914c8073ec82f2546ae23a72c48f
push id40935
push userbmo:cam@mcc.id.au
push dateTue, 10 Jan 2017 07:11:37 +0000
bugs1329861
milestone53.0a1
backs oute39a1f381b857108f1e412722e52c2ae054100c1
Backed out changeset e39a1f381b85 (bug 1329861) for failures in browser_webconsole_console_trace_async.js and browser_net_cause.js CLOSED TREE MozReview-Commit-ID: GeiUQqUy9NG
tools/profiler/gecko/nsProfiler.cpp
tools/profiler/gecko/nsProfiler.h
--- a/tools/profiler/gecko/nsProfiler.cpp
+++ b/tools/profiler/gecko/nsProfiler.cpp
@@ -14,31 +14,26 @@
 #include "nsIObserverService.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsILoadContext.h"
 #include "nsIWebNavigation.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "shared-libraries.h"
 #include "js/Value.h"
 #include "mozilla/ErrorResult.h"
-#include "mozilla/Preferences.h"
 #include "mozilla/dom/Promise.h"
 
 using mozilla::ErrorResult;
-using mozilla::Preferences;
 using mozilla::dom::Promise;
 using std::string;
 
-static const char* kAsyncStacksPrefName = "javascript.options.asyncstack";
-
 NS_IMPL_ISUPPORTS(nsProfiler, nsIProfiler)
 
 nsProfiler::nsProfiler()
   : mLockedForPrivateBrowsing(false)
-  , mAsyncStacksWereEnabled(false)
 {
 }
 
 nsProfiler::~nsProfiler()
 {
   nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
   if (observerService) {
     observerService->RemoveObserver(this, "chrome-document-global-created");
@@ -87,32 +82,25 @@ NS_IMETHODIMP
 nsProfiler::StartProfiler(uint32_t aEntries, double aInterval,
                           const char** aFeatures, uint32_t aFeatureCount,
                           const char** aThreadNameFilters, uint32_t aFilterCount)
 {
   if (mLockedForPrivateBrowsing) {
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  mAsyncStacksWereEnabled = Preferences::GetBool(kAsyncStacksPrefName);
-  if (mAsyncStacksWereEnabled) {
-    Preferences::SetBool(kAsyncStacksPrefName, false);
-  }
-
   profiler_start(aEntries, aInterval,
                  aFeatures, aFeatureCount,
                  aThreadNameFilters, aFilterCount);
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsProfiler::StopProfiler()
 {
-  Preferences::SetBool(kAsyncStacksPrefName, mAsyncStacksWereEnabled);
-
   profiler_stop();
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsProfiler::IsPaused(bool *aIsPaused)
 {
   *aIsPaused = profiler_is_paused();
@@ -312,9 +300,9 @@ nsProfiler::GetProfileGatherer(nsISuppor
   if (!profiler_is_active()) {
     *aRetVal = nullptr;
   } else {
     nsCOMPtr<nsISupports> gatherer;
     profiler_get_gatherer(getter_AddRefs(gatherer));
     gatherer.forget(aRetVal);
   }
   return NS_OK;
-}
+}
\ No newline at end of file
--- a/tools/profiler/gecko/nsProfiler.h
+++ b/tools/profiler/gecko/nsProfiler.h
@@ -18,13 +18,12 @@ public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIOBSERVER
     NS_DECL_NSIPROFILER
 
     nsresult Init();
 private:
     ~nsProfiler();
     bool mLockedForPrivateBrowsing;
-    bool mAsyncStacksWereEnabled;
 };
 
 #endif /* _NSPROFILER_H_ */