Backed out changeset 3ad8f1ba9de6 (bug 1384688)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 31 Jul 2017 20:09:52 +0200
changeset 420731 1ab0d2a28f1b7b73c462d24d8b0d8fa3f393233f
parent 420730 40d2ccee4fa895a9b83db74259b8305ce072b99e
child 420732 6806dd90d02e0788e5663982c29ccc33daa8fe86
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1384688
milestone56.0a1
backs out3ad8f1ba9de6ebe7fae8b41ea5c3e280b8b71b86
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
Backed out changeset 3ad8f1ba9de6 (bug 1384688)
tools/profiler/gecko/ProfilerChild.cpp
--- a/tools/profiler/gecko/ProfilerChild.cpp
+++ b/tools/profiler/gecko/ProfilerChild.cpp
@@ -70,33 +70,32 @@ ProfilerChild::RecvPause()
 mozilla::ipc::IPCResult
 ProfilerChild::RecvResume()
 {
   profiler_resume();
   return IPC_OK();
 }
 
 static nsCString
-CollectProfileOrEmptyString(bool aIsShuttingDown)
+CollectProfileOrEmptyString()
 {
   nsCString profileCString;
-  UniquePtr<char[]> profile =
-    profiler_get_profile(/* aSinceTime */ 0, aIsShuttingDown);
+  UniquePtr<char[]> profile = profiler_get_profile();
   if (profile) {
     profileCString = nsCString(profile.get(), strlen(profile.get()));
   } else {
     profileCString = EmptyCString();
   }
   return profileCString;
 }
 
 mozilla::ipc::IPCResult
 ProfilerChild::RecvGatherProfile(GatherProfileResolver&& aResolve)
 {
-  aResolve(CollectProfileOrEmptyString(/* aIsShuttingDown */ false));
+  aResolve(CollectProfileOrEmptyString());
   return IPC_OK();
 }
 
 void
 ProfilerChild::ActorDestroy(ActorDestroyReason aActorDestroyReason)
 {
   mDestroyed = true;
 }
@@ -107,12 +106,12 @@ ProfilerChild::Destroy()
   if (!mDestroyed) {
     Close();
   }
 }
 
 nsCString
 ProfilerChild::GrabShutdownProfile()
 {
-  return CollectProfileOrEmptyString(/* aIsShuttingDown */ true);
+  return CollectProfileOrEmptyString();
 }
 
 } // namespace mozilla