Bug 1960785 - Generalize JSActor::SetName() into Init(). r=nika
This will make it easier for me to add a new private field whose initialization value depends on the init fields. Differential Revision: https://phabricator.services.mozilla.com/D245655
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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; }
|
||||
|
||||
|
||||
@@ -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; }
|
||||
|
||||
@@ -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); }
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user