corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1960785 - Generalize JSActor::SetName() into Init(). r=nika

Browse Source 
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:
Andrew McCreight
2025-04-16 13:08:11 +00:00
parent 4375fa0a1c
commit 48c9054e2c
6 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dom/ipc/jsactor/JSActor.cpp
View File

@@ -153,9 +153,10 @@ nsresult JSActor::QueryInterfaceActor(const nsIID& aIID, void** aPtr) {
return mWrappedJS->QueryInterface(aIID, 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!"); MOZ_ASSERT(mName.IsEmpty(), "Cannot set name twice!");
mName = aName; mName = aName;
InvokeCallback(CallbackFunction::ActorCreated);
} }
void JSActor::ThrowStateErrorForGetter(const char* aName, void JSActor::ThrowStateErrorForGetter(const char* aName,

2
dom/ipc/jsactor/JSActor.h
View File

@@ -79,7 +79,7 @@ class JSActor : public nsISupports, public nsWrapperCache {
virtual ~JSActor() = default; virtual ~JSActor() = default;
void SetName(const nsACString& aName); void Init(const nsACString& aName);
bool CanSend() const { return mCanSend; } bool CanSend() const { return mCanSend; }

4
dom/ipc/jsactor/JSProcessActorChild.cpp
View File

@@ -75,10 +75,8 @@ void JSProcessActorChild::SendRawMessage(
void JSProcessActorChild::Init(const nsACString& aName, void JSProcessActorChild::Init(const nsACString& aName,
nsIDOMProcessChild* aManager) { nsIDOMProcessChild* aManager) {
MOZ_ASSERT(!mManager, "Cannot Init() a JSProcessActorChild twice!"); MOZ_ASSERT(!mManager, "Cannot Init() a JSProcessActorChild twice!");
SetName(aName);
mManager = aManager; mManager = aManager;
JSActor::Init(aName);
InvokeCallback(CallbackFunction::ActorCreated);
} }
void JSProcessActorChild::ClearManager() { mManager = nullptr; } void JSProcessActorChild::ClearManager() { mManager = nullptr; }

4
dom/ipc/jsactor/JSProcessActorParent.cpp
View File

@@ -27,10 +27,8 @@ JSObject* JSProcessActorParent::WrapObject(JSContext* aCx,
void JSProcessActorParent::Init(const nsACString& aName, void JSProcessActorParent::Init(const nsACString& aName,
nsIDOMProcessParent* aManager) { nsIDOMProcessParent* aManager) {
MOZ_ASSERT(!mManager, "Cannot Init() a JSProcessActorParent twice!"); MOZ_ASSERT(!mManager, "Cannot Init() a JSProcessActorParent twice!");
SetName(aName);
mManager = aManager; mManager = aManager;
JSActor::Init(aName);
InvokeCallback(CallbackFunction::ActorCreated);
} }
JSProcessActorParent::~JSProcessActorParent() { MOZ_ASSERT(!mManager); } JSProcessActorParent::~JSProcessActorParent() { MOZ_ASSERT(!mManager); }

4
dom/ipc/jsactor/JSWindowActorChild.cpp
View File

@@ -32,10 +32,8 @@ WindowContext* JSWindowActorChild::GetWindowContext() const {
void JSWindowActorChild::Init(const nsACString& aName, void JSWindowActorChild::Init(const nsACString& aName,
WindowGlobalChild* aManager) { WindowGlobalChild* aManager) {
MOZ_ASSERT(!mManager, "Cannot Init() a JSWindowActorChild twice!"); MOZ_ASSERT(!mManager, "Cannot Init() a JSWindowActorChild twice!");
SetName(aName);
mManager = aManager; mManager = aManager;
JSActor::Init(aName);
InvokeCallback(CallbackFunction::ActorCreated);
} }
void JSWindowActorChild::SendRawMessage( void JSWindowActorChild::SendRawMessage(

4
dom/ipc/jsactor/JSWindowActorParent.cpp
View File

@@ -30,10 +30,8 @@ WindowContext* JSWindowActorParent::GetWindowContext() const {
void JSWindowActorParent::Init(const nsACString& aName, void JSWindowActorParent::Init(const nsACString& aName,
WindowGlobalParent* aManager) { WindowGlobalParent* aManager) {
MOZ_ASSERT(!mManager, "Cannot Init() a JSWindowActorParent twice!"); MOZ_ASSERT(!mManager, "Cannot Init() a JSWindowActorParent twice!");
SetName(aName);
mManager = aManager; mManager = aManager;
JSActor::Init(aName);
InvokeCallback(CallbackFunction::ActorCreated);
} }
void JSWindowActorParent::SendRawMessage( void JSWindowActorParent::SendRawMessage(