diff --git a/dom/ipc/jsactor/JSActor.cpp b/dom/ipc/jsactor/JSActor.cpp index 2c706ca515de..bf2b119458fb 100644 --- a/dom/ipc/jsactor/JSActor.cpp +++ b/dom/ipc/jsactor/JSActor.cpp @@ -153,9 +153,10 @@ nsresult JSActor::QueryInterfaceActor(const nsIID& aIID, void** aPtr) { return mWrappedJS->QueryInterface(aIID, aPtr); } -void JSActor::SetName(const nsACString& aName) { +void JSActor::Init(const nsACString& aName) { MOZ_ASSERT(mName.IsEmpty(), "Cannot set name twice!"); mName = aName; + InvokeCallback(CallbackFunction::ActorCreated); } void JSActor::ThrowStateErrorForGetter(const char* aName, diff --git a/dom/ipc/jsactor/JSActor.h b/dom/ipc/jsactor/JSActor.h index 6c6678a7fff2..20bac19815b0 100644 --- a/dom/ipc/jsactor/JSActor.h +++ b/dom/ipc/jsactor/JSActor.h @@ -79,7 +79,7 @@ class JSActor : public nsISupports, public nsWrapperCache { virtual ~JSActor() = default; - void SetName(const nsACString& aName); + void Init(const nsACString& aName); bool CanSend() const { return mCanSend; } diff --git a/dom/ipc/jsactor/JSProcessActorChild.cpp b/dom/ipc/jsactor/JSProcessActorChild.cpp index a9379838cfa4..4278b18a853c 100644 --- a/dom/ipc/jsactor/JSProcessActorChild.cpp +++ b/dom/ipc/jsactor/JSProcessActorChild.cpp @@ -75,10 +75,8 @@ void JSProcessActorChild::SendRawMessage( void JSProcessActorChild::Init(const nsACString& aName, nsIDOMProcessChild* aManager) { MOZ_ASSERT(!mManager, "Cannot Init() a JSProcessActorChild twice!"); - SetName(aName); mManager = aManager; - - InvokeCallback(CallbackFunction::ActorCreated); + JSActor::Init(aName); } void JSProcessActorChild::ClearManager() { mManager = nullptr; } diff --git a/dom/ipc/jsactor/JSProcessActorParent.cpp b/dom/ipc/jsactor/JSProcessActorParent.cpp index eec8ad17c73b..70031ce2a48e 100644 --- a/dom/ipc/jsactor/JSProcessActorParent.cpp +++ b/dom/ipc/jsactor/JSProcessActorParent.cpp @@ -27,10 +27,8 @@ JSObject* JSProcessActorParent::WrapObject(JSContext* aCx, void JSProcessActorParent::Init(const nsACString& aName, nsIDOMProcessParent* aManager) { MOZ_ASSERT(!mManager, "Cannot Init() a JSProcessActorParent twice!"); - SetName(aName); mManager = aManager; - - InvokeCallback(CallbackFunction::ActorCreated); + JSActor::Init(aName); } JSProcessActorParent::~JSProcessActorParent() { MOZ_ASSERT(!mManager); } diff --git a/dom/ipc/jsactor/JSWindowActorChild.cpp b/dom/ipc/jsactor/JSWindowActorChild.cpp index 57d08156801f..50aea7ca3ca7 100644 --- a/dom/ipc/jsactor/JSWindowActorChild.cpp +++ b/dom/ipc/jsactor/JSWindowActorChild.cpp @@ -32,10 +32,8 @@ WindowContext* JSWindowActorChild::GetWindowContext() const { void JSWindowActorChild::Init(const nsACString& aName, WindowGlobalChild* aManager) { MOZ_ASSERT(!mManager, "Cannot Init() a JSWindowActorChild twice!"); - SetName(aName); mManager = aManager; - - InvokeCallback(CallbackFunction::ActorCreated); + JSActor::Init(aName); } void JSWindowActorChild::SendRawMessage( diff --git a/dom/ipc/jsactor/JSWindowActorParent.cpp b/dom/ipc/jsactor/JSWindowActorParent.cpp index 0bb82a9b8ec6..fd1405bcb5bb 100644 --- a/dom/ipc/jsactor/JSWindowActorParent.cpp +++ b/dom/ipc/jsactor/JSWindowActorParent.cpp @@ -30,10 +30,8 @@ WindowContext* JSWindowActorParent::GetWindowContext() const { void JSWindowActorParent::Init(const nsACString& aName, WindowGlobalParent* aManager) { MOZ_ASSERT(!mManager, "Cannot Init() a JSWindowActorParent twice!"); - SetName(aName); mManager = aManager; - - InvokeCallback(CallbackFunction::ActorCreated); + JSActor::Init(aName); } void JSWindowActorParent::SendRawMessage(