diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp index 791adf40d10..b0f9ae79eb3 100644 --- a/dom/ipc/ContentChild.cpp +++ b/dom/ipc/ContentChild.cpp @@ -2458,7 +2458,7 @@ ContentChild::RecvStopProfiler() } bool -ContentChild::AnswerGetProfile(nsCString* aProfile) +ContentChild::RecvGetProfile(nsCString* aProfile) { char* profile = profiler_get_profile(); if (profile) { diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h index 303142066cf..8315b6f180f 100644 --- a/dom/ipc/ContentChild.h +++ b/dom/ipc/ContentChild.h @@ -365,7 +365,7 @@ public: const nsTArray& aFeatures, const nsTArray& aThreadNameFilters) MOZ_OVERRIDE; virtual bool RecvStopProfiler() MOZ_OVERRIDE; - virtual bool AnswerGetProfile(nsCString* aProfile) MOZ_OVERRIDE; + virtual bool RecvGetProfile(nsCString* aProfile) MOZ_OVERRIDE; #ifdef ANDROID gfxIntSize GetScreenSize() { return mScreenSize; } diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index b982e3a37d3..6fba7bf4e46 100755 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -2869,7 +2869,7 @@ ContentParent::Observe(nsISupports* aSubject, nsCOMPtr pse = do_QueryInterface(aSubject); if (pse) { nsCString result; - unused << CallGetProfile(&result); + unused << SendGetProfile(&result); if (!result.IsEmpty()) { pse->AddSubProfile(result.get()); } diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl index fc751b7e4d8..4ee89e32db5 100644 --- a/dom/ipc/PContent.ipdl +++ b/dom/ipc/PContent.ipdl @@ -521,7 +521,7 @@ child: async StartProfiler(uint32_t aEntries, double aInterval, nsCString[] aFeatures, nsCString[] aThreadNameFilters); async StopProfiler(); - intr GetProfile() + prio(high) sync GetProfile() returns (nsCString aProfile); NuwaFreeze();