commit 13ee37f4a40a7f4abadd6e9431eaff7b1ea3fbb9
parent f221c755f5a0dd62eca5a220acc011c9fcfc91b5
Author: Andrew McCreight <continuation@gmail.com>
Date: Mon, 15 Dec 2025 22:30:32 +0000
Bug 2005849 - Move mName to JSActorProtocol. r=nika
Also remove 1 unused include.
Differential Revision: https://phabricator.services.mozilla.com/D276548
Diffstat:
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dom/ipc/jsactor/JSActorService.h b/dom/ipc/jsactor/JSActorService.h
@@ -106,8 +106,10 @@ class JSActorProtocol : public nsISupports {
bool mLoadInDevToolsLoader = false;
protected:
+ explicit JSActorProtocol(const nsACString& aName) : mName(aName) {}
bool RemoteTypePrefixMatches(const nsACString& aRemoteType);
+ nsCString mName;
nsTArray<nsCString> mRemoteTypes;
};
diff --git a/dom/ipc/jsactor/JSProcessActorProtocol.h b/dom/ipc/jsactor/JSProcessActorProtocol.h
@@ -10,7 +10,6 @@
#include "mozilla/dom/BrowsingContext.h"
#include "mozilla/dom/JSActorService.h"
#include "nsIObserver.h"
-#include "nsIURI.h"
#include "nsString.h"
#include "nsTArray.h"
@@ -59,10 +58,10 @@ class JSProcessActorProtocol final : public JSActorProtocol,
bool Matches(const nsACString& aRemoteType, ErrorResult& aRv);
private:
- explicit JSProcessActorProtocol(const nsACString& aName) : mName(aName) {}
+ explicit JSProcessActorProtocol(const nsACString& aName)
+ : JSActorProtocol(aName) {}
~JSProcessActorProtocol() = default;
- nsCString mName;
bool mIncludeParent = false;
friend class JSActorProtocolUtils;
diff --git a/dom/ipc/jsactor/JSWindowActorProtocol.h b/dom/ipc/jsactor/JSWindowActorProtocol.h
@@ -76,12 +76,12 @@ class JSWindowActorProtocol final : public JSActorProtocol,
const nsACString& aRemoteType, ErrorResult& aRv);
private:
- explicit JSWindowActorProtocol(const nsACString& aName) : mName(aName) {}
+ explicit JSWindowActorProtocol(const nsACString& aName)
+ : JSActorProtocol(aName) {}
extensions::MatchPatternSetCore* GetURIMatcher();
bool MessageManagerGroupMatches(BrowsingContext* aBrowsingContext);
~JSWindowActorProtocol() = default;
- nsCString mName;
bool mAllFrames = false;
bool mIncludeChrome = false;
nsTArray<nsString> mMatches;