Bug 1368031 - Fix PProfiler::GatherProfile r=mstange
authorKan-Ru Chen <kanru@kanru.info>
Wed, 31 May 2017 21:59:36 +0800
changeset 361792 e6f613b7ec08ca91240e1c28e687bad0ff38f2e4
parent 361791 9a39e2222a478bb59bfbc1ee0d6d41adca1e392c
child 361793 001d49708a355c9b127fc338722959874cfc7552
push id31943
push userryanvm@gmail.com
push dateThu, 01 Jun 2017 15:54:45 +0000
treeherdermozilla-central@62005e6aecdf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmstange
bugs1368031
milestone55.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 1368031 - Fix PProfiler::GatherProfile r=mstange MozReview-Commit-ID: YzJ9UA6Rj6
tools/profiler/gecko/ProfilerChild.cpp
tools/profiler/public/ProfilerChild.h
--- a/tools/profiler/gecko/ProfilerChild.cpp
+++ b/tools/profiler/gecko/ProfilerChild.cpp
@@ -68,19 +68,19 @@ CollectProfileOrEmptyString()
     profileCString = nsCString(profile.get(), strlen(profile.get()));
   } else {
     profileCString = EmptyCString();
   }
   return profileCString;
 }
 
 mozilla::ipc::IPCResult
-ProfilerChild::RecvGatherProfile(RefPtr<GatherProfilePromise>&& aPromise)
+ProfilerChild::RecvGatherProfile(GatherProfileResolver&& aResolve)
 {
-  aPromise->Resolve(CollectProfileOrEmptyString(), __func__);
+  aResolve(CollectProfileOrEmptyString());
   return IPC_OK();
 }
 
 void
 ProfilerChild::ActorDestroy(ActorDestroyReason aActorDestroyReason)
 {
   mDestroyed = true;
 }
--- a/tools/profiler/public/ProfilerChild.h
+++ b/tools/profiler/public/ProfilerChild.h
@@ -34,17 +34,17 @@ class ProfilerChild final : public PProf
 
 private:
   virtual ~ProfilerChild();
 
   mozilla::ipc::IPCResult RecvStart(const ProfilerInitParams& params) override;
   mozilla::ipc::IPCResult RecvStop() override;
   mozilla::ipc::IPCResult RecvPause() override;
   mozilla::ipc::IPCResult RecvResume() override;
-  mozilla::ipc::IPCResult RecvGatherProfile(RefPtr<GatherProfilePromise>&& aPromise) override;
+  mozilla::ipc::IPCResult RecvGatherProfile(GatherProfileResolver&& aResolve) override;
 
   void ActorDestroy(ActorDestroyReason aActorDestroyReason) override;
 
   nsCOMPtr<nsIThread> mThread;
   bool mDestroyed;
 };
 
 } // namespace mozilla