Bug 1874739 - Part 9: Make PSpeechSynthesis refcounted, r=eeejay

This is part of removing [ManualDealloc] from all protocols which manage other
protocols.

Differential Revision: https://phabricator.services.mozilla.com/D198619

Author: mystor

dom/ipc/ContentChild.cpp

@@ -2013,17 +2013,6 @@ bool ContentChild::DeallocPBenchmarkStorageChild(
   return true;
 }
 
-#ifdef MOZ_WEBSPEECH
-PSpeechSynthesisChild* ContentChild::AllocPSpeechSynthesisChild() {
-  MOZ_CRASH("No one should be allocating PSpeechSynthesisChild actors");
-}
-
-bool ContentChild::DeallocPSpeechSynthesisChild(PSpeechSynthesisChild* aActor) {
-  delete aActor;
-  return true;
-}
-#endif
-
 #ifdef MOZ_WEBRTC
 PWebrtcGlobalChild* ContentChild::AllocPWebrtcGlobalChild() {
   auto* child = new WebrtcGlobalChild();

dom/ipc/ContentChild.h

@@ -244,11 +244,6 @@ class ContentChild final : public PContentChild,
 
   mozilla::ipc::IPCResult RecvNotifyEmptyHTTPCache();
 
-#ifdef MOZ_WEBSPEECH
-  PSpeechSynthesisChild* AllocPSpeechSynthesisChild();
-  bool DeallocPSpeechSynthesisChild(PSpeechSynthesisChild* aActor);
-#endif
-
   mozilla::ipc::IPCResult RecvRegisterChrome(
       nsTArray<ChromePackage>&& packages,
       nsTArray<SubstitutionMapping>&& resources,

dom/ipc/ContentParent.cpp

@@ -4781,17 +4781,13 @@ bool ContentParent::DeallocPBenchmarkStorageParent(
 }
 
 #ifdef MOZ_WEBSPEECH
-PSpeechSynthesisParent* ContentParent::AllocPSpeechSynthesisParent() {
+already_AddRefed<PSpeechSynthesisParent>
+ContentParent::AllocPSpeechSynthesisParent() {
   if (!StaticPrefs::media_webspeech_synth_enabled()) {
     return nullptr;
   }
-  return new mozilla::dom::SpeechSynthesisParent();
-}
-
-bool ContentParent::DeallocPSpeechSynthesisParent(
-    PSpeechSynthesisParent* aActor) {
-  delete aActor;
-  return true;
+  RefPtr<SpeechSynthesisParent> actor = new SpeechSynthesisParent();
+  return actor.forget();
 }
 
 mozilla::ipc::IPCResult ContentParent::RecvPSpeechSynthesisConstructor(

dom/ipc/ContentParent.h

@@ -962,8 +962,7 @@ class ContentParent final : public PContentParent,
   bool DeallocPBenchmarkStorageParent(PBenchmarkStorageParent* aActor);
 
 #ifdef MOZ_WEBSPEECH
-  PSpeechSynthesisParent* AllocPSpeechSynthesisParent();
-  bool DeallocPSpeechSynthesisParent(PSpeechSynthesisParent* aActor);
+  already_AddRefed<PSpeechSynthesisParent> AllocPSpeechSynthesisParent();
 
   virtual mozilla::ipc::IPCResult RecvPSpeechSynthesisConstructor(
       PSpeechSynthesisParent* aActor) override;

dom/media/webspeech/synth/ipc/PSpeechSynthesis.ipdl

@@ -18,7 +18,6 @@ struct RemoteVoice {
   bool queued;
 };
 
-[ManualDealloc]
 sync protocol PSpeechSynthesis
 {
   manager PContent;

dom/media/webspeech/synth/ipc/SpeechSynthesisChild.h

@@ -21,6 +21,8 @@ class SpeechSynthesisChild : public PSpeechSynthesisChild {
   friend class PSpeechSynthesisChild;
 
  public:
+  NS_INLINE_DECL_REFCOUNTING(SpeechSynthesisChild, override)
+
   mozilla::ipc::IPCResult RecvInitialVoicesAndState(
       nsTArray<RemoteVoice>&& aVoices, nsTArray<nsString>&& aDefaults,
       const bool& aIsSpeaking);

dom/media/webspeech/synth/ipc/SpeechSynthesisParent.h

@@ -21,6 +21,8 @@ class SpeechSynthesisParent : public PSpeechSynthesisParent {
   friend class PSpeechSynthesisParent;
 
  public:
+  NS_INLINE_DECL_REFCOUNTING(SpeechSynthesisParent, override)
+
   void ActorDestroy(ActorDestroyReason aWhy) override;
 
   bool SendInit();

dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp

@@ -146,7 +146,7 @@ NS_IMPL_ISUPPORTS(nsSynthVoiceRegistry, nsISynthVoiceRegistry)
 nsSynthVoiceRegistry::nsSynthVoiceRegistry()
     : mSpeechSynthChild(nullptr), mUseGlobalQueue(false), mIsSpeaking(false) {
   if (XRE_IsContentProcess()) {
-    SpeechSynthesisChild* actor = new SpeechSynthesisChild();
+    RefPtr<SpeechSynthesisChild> actor = new SpeechSynthesisChild();
     if (ContentChild::GetSingleton()->SendPSpeechSynthesisConstructor(actor)) {
       mSpeechSynthChild = actor;
     }
@@ -156,9 +156,6 @@ nsSynthVoiceRegistry::nsSynthVoiceRegistry()
 nsSynthVoiceRegistry::~nsSynthVoiceRegistry() {
   LOG(LogLevel::Debug, ("~nsSynthVoiceRegistry"));
 
-  // mSpeechSynthChild's lifecycle is managed by the Content protocol.
-  mSpeechSynthChild = nullptr;
-
   mUriVoiceMap.Clear();
 }
 

dom/media/webspeech/synth/nsSynthVoiceRegistry.h

@@ -87,7 +87,7 @@ class nsSynthVoiceRegistry final : public nsISynthVoiceRegistry {
 
   nsRefPtrHashtable<nsStringHashKey, VoiceData> mUriVoiceMap;
 
-  SpeechSynthesisChild* mSpeechSynthChild;
+  RefPtr<SpeechSynthesisChild> mSpeechSynthChild;
 
   bool mUseGlobalQueue;