Skip to content

Commit c850a94

Browse files
mystormystor
committed
Bug 1650163 - Part 1: Switch native remoteType values to nsCString, r=farre,geckoview-reviewers,agi
Differential Revision: https://phabricator.services.mozilla.com/D82104
1 parent 4f0c38a commit c850a94

File tree

74 files changed

+308
-356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+308
-356
lines changed

‎browser/components/about/AboutRedirector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ AboutRedirector::NewChannel(nsIURI* aURI, nsILoadInfo* aLoadInfo,
156156
// startup cache.
157157
if (XRE_IsContentProcess() && path.EqualsLiteral("home")) {
158158
auto& remoteType = dom::ContentChild::GetSingleton()->GetRemoteType();
159-
if (remoteType.EqualsLiteral(PRIVILEGEDABOUT_REMOTE_TYPE)) {
159+
if (remoteType == PRIVILEGEDABOUT_REMOTE_TYPE) {
160160
nsCOMPtr<nsIAboutNewTabService> aboutNewTabService =
161161
do_GetService("@mozilla.org/browser/aboutnewtab-service;1", &rv);
162162
NS_ENSURE_SUCCESS(rv, rv);

‎caps/nsScriptSecurityManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ nsresult nsScriptSecurityManager::CheckLoadURIFlags(
938938
}
939939

940940
auto& remoteType = dom::ContentChild::GetSingleton()->GetRemoteType();
941-
if (remoteType.EqualsLiteral(PRIVILEGEDABOUT_REMOTE_TYPE)) {
941+
if (remoteType == PRIVILEGEDABOUT_REMOTE_TYPE) {
942942
return NS_OK;
943943
}
944944
}

‎docshell/base/BrowsingContext.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,9 +1047,8 @@ bool BrowsingContext::CrossOriginIsolated() {
10471047
nsILoadInfo::
10481048
OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP &&
10491049
XRE_IsContentProcess() &&
1050-
StringBeginsWith(
1051-
ContentChild::GetSingleton()->GetRemoteType(),
1052-
NS_LITERAL_STRING_FROM_CSTRING(WITH_COOP_COEP_REMOTE_TYPE_PREFIX));
1050+
StringBeginsWith(ContentChild::GetSingleton()->GetRemoteType(),
1051+
WITH_COOP_COEP_REMOTE_TYPE_PREFIX);
10531052
}
10541053

10551054
BrowsingContext::~BrowsingContext() {

‎docshell/base/CanonicalBrowsingContext.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ ContentParent* CanonicalBrowsingContext::GetContentParent() const {
9494
return cpm->GetContentProcessById(ContentParentId(mProcessId));
9595
}
9696

97-
void CanonicalBrowsingContext::GetCurrentRemoteType(nsAString& aRemoteType,
97+
void CanonicalBrowsingContext::GetCurrentRemoteType(nsACString& aRemoteType,
9898
ErrorResult& aRv) const {
9999
// If we're in the parent process, dump out the void string.
100100
if (mProcessId == 0) {
101-
aRemoteType.Assign(VoidString());
101+
aRemoteType.Assign(VoidCString());
102102
return;
103103
}
104104

@@ -822,7 +822,7 @@ CanonicalBrowsingContext::PendingRemotenessChange::~PendingRemotenessChange() {
822822
}
823823

824824
RefPtr<CanonicalBrowsingContext::RemotenessPromise>
825-
CanonicalBrowsingContext::ChangeRemoteness(const nsAString& aRemoteType,
825+
CanonicalBrowsingContext::ChangeRemoteness(const nsACString& aRemoteType,
826826
uint64_t aPendingSwitchId,
827827
bool aReplaceBrowsingContext,
828828
uint64_t aSpecificGroupId) {

‎docshell/base/CanonicalBrowsingContext.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class CanonicalBrowsingContext final : public BrowsingContext {
5959
uint64_t EmbedderProcessId() const { return mEmbedderProcessId; }
6060
ContentParent* GetContentParent() const;
6161

62-
void GetCurrentRemoteType(nsAString& aRemoteType, ErrorResult& aRv) const;
62+
void GetCurrentRemoteType(nsACString& aRemoteType, ErrorResult& aRv) const;
6363

6464
void SetOwnerProcessId(uint64_t aProcessId);
6565

@@ -150,10 +150,10 @@ class CanonicalBrowsingContext final : public BrowsingContext {
150150
// Internal method to change which process a BrowsingContext is being loaded
151151
// in. The returned promise will resolve when the process switch is completed.
152152
//
153-
// A VoidString() aRemoteType argument will perform a process switch into the
153+
// A VoidCString() aRemoteType argument will perform a process switch into the
154154
// parent process, and the method will resolve with a null BrowserParent.
155155
using RemotenessPromise = MozPromise<RefPtr<BrowserParent>, nsresult, false>;
156-
RefPtr<RemotenessPromise> ChangeRemoteness(const nsAString& aRemoteType,
156+
RefPtr<RemotenessPromise> ChangeRemoteness(const nsACString& aRemoteType,
157157
uint64_t aPendingSwitchId,
158158
bool aReplaceBrowsingContext,
159159
uint64_t aSpecificGroupId);

‎dom/base/ChromeUtils.cpp

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ already_AddRefed<Promise> ChromeUtils::RequestProcInfo(GlobalObject& aGlobal,
795795
global->EventTargetFor(TaskCategory::Performance);
796796

797797
// Getting the parent proc info
798-
mozilla::GetProcInfo(parentPid, 0, mozilla::ProcType::Browser, u""_ns)
798+
mozilla::GetProcInfo(parentPid, 0, mozilla::ProcType::Browser, ""_ns)
799799
->Then(
800800
target, __func__,
801801
[target, domPromise, parentPid](ProcInfo aParentInfo) {
@@ -809,7 +809,7 @@ already_AddRefed<Promise> ChromeUtils::RequestProcInfo(GlobalObject& aGlobal,
809809
if (!aGeckoProcess->GetChildProcessHandle()) {
810810
return;
811811
}
812-
nsAutoString origin;
812+
nsAutoCString origin;
813813
base::ProcessId childPid =
814814
base::GetProcId(aGeckoProcess->GetChildProcessHandle());
815815
int32_t childId = 0;
@@ -832,50 +832,42 @@ already_AddRefed<Promise> ChromeUtils::RequestProcInfo(GlobalObject& aGlobal,
832832
// Converting the remoteType into a ProcType.
833833
// Ideally, the remoteType should be strongly typed
834834
// upstream, this would make the conversion less brittle.
835-
nsAutoString remoteType(contentParent->GetRemoteType());
835+
nsAutoCString remoteType(contentParent->GetRemoteType());
836836
if (StringBeginsWith(remoteType,
837-
NS_LITERAL_STRING_FROM_CSTRING(
838-
FISSION_WEB_REMOTE_TYPE))) {
837+
FISSION_WEB_REMOTE_TYPE)) {
839838
// WARNING: Do not change the order, as
840839
// `DEFAULT_REMOTE_TYPE` is a prefix of
841840
// `FISSION_WEB_REMOTE_TYPE`.
842841
type = mozilla::ProcType::WebIsolated;
843-
} else if (StringBeginsWith(
844-
remoteType, NS_LITERAL_STRING_FROM_CSTRING(
845-
DEFAULT_REMOTE_TYPE))) {
842+
} else if (StringBeginsWith(remoteType,
843+
DEFAULT_REMOTE_TYPE)) {
846844
type = mozilla::ProcType::Web;
847-
} else if (remoteType.EqualsLiteral(FILE_REMOTE_TYPE)) {
845+
} else if (remoteType == FILE_REMOTE_TYPE) {
848846
type = mozilla::ProcType::File;
849-
} else if (remoteType.EqualsLiteral(
850-
EXTENSION_REMOTE_TYPE)) {
847+
} else if (remoteType == EXTENSION_REMOTE_TYPE) {
851848
type = mozilla::ProcType::Extension;
852-
} else if (remoteType.EqualsLiteral(
853-
PRIVILEGEDABOUT_REMOTE_TYPE)) {
849+
} else if (remoteType == PRIVILEGEDABOUT_REMOTE_TYPE) {
854850
type = mozilla::ProcType::PrivilegedAbout;
855-
} else if (remoteType.EqualsLiteral(
856-
PRIVILEGEDMOZILLA_REMOTE_TYPE)) {
851+
} else if (remoteType == PRIVILEGEDMOZILLA_REMOTE_TYPE) {
857852
type = mozilla::ProcType::PrivilegedMozilla;
858853
} else if (StringBeginsWith(
859854
remoteType,
860-
NS_LITERAL_STRING_FROM_CSTRING(
861-
WITH_COOP_COEP_REMOTE_TYPE_PREFIX))) {
855+
WITH_COOP_COEP_REMOTE_TYPE_PREFIX)) {
862856
type = mozilla::ProcType::WebCOOPCOEP;
863-
} else if (remoteType.EqualsLiteral(
864-
LARGE_ALLOCATION_REMOTE_TYPE)) {
857+
} else if (remoteType == LARGE_ALLOCATION_REMOTE_TYPE) {
865858
type = mozilla::ProcType::WebLargeAllocation;
866-
} else if (remoteType.EqualsLiteral(
867-
PREALLOC_REMOTE_TYPE)) {
859+
} else if (remoteType == PREALLOC_REMOTE_TYPE) {
868860
type = mozilla::ProcType::Preallocated;
869861
} else {
870862
MOZ_CRASH("Unknown remoteType");
871863
}
872864

873865
// By convention, everything after '=' is the origin.
874-
nsAString::const_iterator cursor;
875-
nsAString::const_iterator end;
866+
nsACString::const_iterator cursor;
867+
nsACString::const_iterator end;
876868
remoteType.BeginReading(cursor);
877869
remoteType.EndReading(end);
878-
if (FindCharInReadable(u'=', cursor, end)) {
870+
if (FindCharInReadable('=', cursor, end)) {
879871
origin = Substring(++cursor, end);
880872
}
881873
childId = contentParent->ChildID();

‎dom/base/MessageManagerGlobal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class MessageManagerGlobal {
7575
return mMessageManager->GetProcessMessageManager(aError);
7676
}
7777

78-
void GetRemoteType(nsAString& aRemoteType, mozilla::ErrorResult& aError) {
78+
void GetRemoteType(nsACString& aRemoteType, mozilla::ErrorResult& aError) {
7979
if (!mMessageManager) {
8080
aError.Throw(NS_ERROR_NOT_INITIALIZED);
8181
return;

‎dom/base/nsFrameLoader.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ nsFrameLoader::nsFrameLoader(Element* aOwner, BrowsingContext* aBrowsingContext,
169169
mDetachedSubdocFrame(nullptr),
170170
mPendingSwitchID(0),
171171
mChildID(0),
172-
mRemoteType(VoidString()),
172+
mRemoteType(VoidCString()),
173173
mDepthTooGreat(false),
174174
mIsTopLevelContent(false),
175175
mDestroyCalled(false),
@@ -351,17 +351,20 @@ static bool InitialLoadIsRemote(Element* aOwner) {
351351
}
352352

353353
static void GetInitialRemoteTypeAndProcess(Element* aOwner,
354-
nsAString& aRemoteType,
354+
nsACString& aRemoteType,
355355
uint64_t* aChildID) {
356356
MOZ_ASSERT(XRE_IsParentProcess());
357357
*aChildID = 0;
358358

359359
// Check if there is an explicit `remoteType` attribute which we should use.
360+
nsAutoString remoteType;
360361
bool hasRemoteType =
361-
aOwner->GetAttr(kNameSpaceID_None, nsGkAtoms::RemoteType, aRemoteType);
362-
if (!hasRemoteType || aRemoteType.IsEmpty()) {
362+
aOwner->GetAttr(kNameSpaceID_None, nsGkAtoms::RemoteType, remoteType);
363+
if (!hasRemoteType || remoteType.IsEmpty()) {
363364
hasRemoteType = false;
364-
aRemoteType.AssignLiteral(DEFAULT_REMOTE_TYPE);
365+
aRemoteType = DEFAULT_REMOTE_TYPE;
366+
} else {
367+
aRemoteType = NS_ConvertUTF16toUTF8(remoteType);
365368
}
366369

367370
// Check if `sameProcessAsFrameLoader` was used to override the process.
@@ -528,7 +531,7 @@ void nsFrameLoader::LoadFrame(bool aOriginalSrc) {
528531
}
529532
}
530533

531-
void nsFrameLoader::ConfigRemoteProcess(const nsAString& aRemoteType,
534+
void nsFrameLoader::ConfigRemoteProcess(const nsACString& aRemoteType,
532535
ContentParent* aContentParent) {
533536
MOZ_DIAGNOSTIC_ASSERT(IsRemoteFrame(), "Must be a remote frame");
534537
MOZ_DIAGNOSTIC_ASSERT(!mRemoteBrowser, "Must not have a browser yet");

‎dom/base/nsFrameLoader.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ class nsFrameLoader final : public nsStubMutationObserver,
398398
// `TryRemoteBrowser`, and a script blocker must be on the stack.
399399
//
400400
// |aContentParent|, if set, must have the remote type |aRemoteType|.
401-
void ConfigRemoteProcess(const nsAString& aRemoteType,
401+
void ConfigRemoteProcess(const nsACString& aRemoteType,
402402
mozilla::dom::ContentParent* aContentParent);
403403

404404
void MaybeNotifyCrashed(mozilla::dom::BrowsingContext* aBrowsingContext,
@@ -515,7 +515,7 @@ class nsFrameLoader final : public nsStubMutationObserver,
515515

516516
RefPtr<mozilla::dom::TabListener> mSessionStoreListener;
517517

518-
nsString mRemoteType;
518+
nsCString mRemoteType;
519519

520520
bool mDepthTooGreat : 1;
521521
bool mIsTopLevelContent : 1;

‎dom/base/nsFrameMessageManager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ NS_INTERFACE_MAP_END
152152
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFrameMessageManager)
153153
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsFrameMessageManager)
154154

155-
void MessageManagerCallback::DoGetRemoteType(nsAString& aRemoteType,
155+
void MessageManagerCallback::DoGetRemoteType(nsACString& aRemoteType,
156156
ErrorResult& aError) const {
157157
aRemoteType.Truncate();
158158
mozilla::dom::ProcessMessageManager* parent = GetProcessMessageManager();
@@ -917,7 +917,7 @@ nsFrameMessageManager::GetProcessMessageManager(ErrorResult& aError) {
917917
return pmm.forget();
918918
}
919919

920-
void nsFrameMessageManager::GetRemoteType(nsAString& aRemoteType,
920+
void nsFrameMessageManager::GetRemoteType(nsACString& aRemoteType,
921921
ErrorResult& aError) const {
922922
aRemoteType.Truncate();
923923
if (mCallback) {

‎dom/base/nsFrameMessageManager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class MessageManagerCallback {
9999
return nullptr;
100100
}
101101

102-
virtual void DoGetRemoteType(nsAString& aRemoteType,
102+
virtual void DoGetRemoteType(nsACString& aRemoteType,
103103
ErrorResult& aError) const;
104104

105105
protected:
@@ -178,7 +178,7 @@ class nsFrameMessageManager : public nsIMessageSender {
178178
}
179179
already_AddRefed<mozilla::dom::ProcessMessageManager>
180180
GetProcessMessageManager(mozilla::ErrorResult& aError);
181-
void GetRemoteType(nsAString& aRemoteType,
181+
void GetRemoteType(nsACString& aRemoteType,
182182
mozilla::ErrorResult& aError) const;
183183

184184
// SyncMessageSender

‎dom/chrome-webidl/BrowsingContext.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ interface CanonicalBrowsingContext : BrowsingContext {
136136
// synchronously create WindowGlobalParent. It can throw if somehow the
137137
// content process has died.
138138
[Throws]
139-
readonly attribute DOMString? currentRemoteType;
139+
readonly attribute UTF8String? currentRemoteType;
140140

141141
readonly attribute WindowGlobalParent? embedderWindowGlobal;
142142

‎dom/chrome-webidl/ChromeUtils.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ dictionary ChildProcInfoDictionary {
555555
sequence<ThreadInfoDictionary> threads = [];
556556
// Firefox info
557557
unsigned long long ChildID = 0;
558-
DOMString origin = "";
558+
UTF8String origin = "";
559559
WebIDLProcType type = "web";
560560
};
561561

‎dom/chrome-webidl/JSProcessActor.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dictionary ProcessActorOptions {
4646
* can prefix match remote type either `web` or `webIsolated`. If not passed,
4747
* all content processes are allowed to instantiate the actor.
4848
*/
49-
sequence<DOMString> remoteTypes;
49+
sequence<UTF8String> remoteTypes;
5050

5151
/** This fields are used for configuring individual sides of the actor. */
5252
ProcessActorSidedOptions parent;

‎dom/chrome-webidl/JSWindowActor.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ dictionary WindowActorOptions {
9797
* can prefix match remote type either `web` or `webIsolated`. If not passed,
9898
* all content processes are allowed to instantiate the actor.
9999
*/
100-
sequence<DOMString> remoteTypes;
100+
sequence<UTF8String> remoteTypes;
101101

102102
/**
103103
* An array of MessageManagerGroup values which restrict which type

‎dom/chrome-webidl/MessageManager.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ interface mixin MessageSenderMixin {
322322
* Otherwise, it is empty.
323323
*/
324324
[Throws]
325-
readonly attribute DOMString remoteType;
325+
readonly attribute UTF8String remoteType;
326326
};
327327

328328
[ChromeOnly, Exposed=Window]

‎dom/interfaces/base/nsIContentProcess.idl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ interface nsIContentProcessProvider : nsISupports
4545
* nsIContentProcessProvider.NEW_PROCESS to ask the caller to create a new
4646
* content process.
4747
*/
48-
int32_t provideProcess(in AString aType,
48+
int32_t provideProcess(in AUTF8String aType,
4949
in Array<nsIContentProcessInfo> aAliveProcesses,
5050
in uint32_t aMaxCount);
5151
};

‎dom/ipc/ContentChild.cpp

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,7 +1653,7 @@ mozilla::ipc::IPCResult ContentChild::RecvSetProcessSandbox(
16531653
// Use the prefix to avoid URIs from Fission isolated processes.
16541654
auto remoteTypePrefix = RemoteTypePrefix(GetRemoteType());
16551655
CrashReporter::AnnotateCrashReport(CrashReporter::Annotation::RemoteType,
1656-
NS_ConvertUTF16toUTF8(remoteTypePrefix));
1656+
remoteTypePrefix);
16571657
#endif /* MOZ_SANDBOX */
16581658

16591659
return IPC_OK();
@@ -2568,38 +2568,36 @@ mozilla::ipc::IPCResult ContentChild::RecvAppInfo(
25682568
}
25692569

25702570
mozilla::ipc::IPCResult ContentChild::RecvRemoteType(
2571-
const nsString& aRemoteType) {
2572-
if (!DOMStringIsNull(mRemoteType)) {
2571+
const nsCString& aRemoteType) {
2572+
if (!mRemoteType.IsVoid()) {
25732573
// Preallocated processes are type PREALLOC_REMOTE_TYPE; they can become
25742574
// anything except a File: process.
25752575
MOZ_LOG(ContentParent::GetLog(), LogLevel::Debug,
25762576
("Changing remoteType of process %d from %s to %s", getpid(),
2577-
NS_ConvertUTF16toUTF8(mRemoteType).get(),
2578-
NS_ConvertUTF16toUTF8(aRemoteType).get()));
2577+
mRemoteType.get(), aRemoteType.get()));
25792578
// prealloc->anything (but file) or web->web allowed
2580-
MOZ_RELEASE_ASSERT(!aRemoteType.EqualsLiteral(FILE_REMOTE_TYPE) &&
2581-
(mRemoteType.EqualsLiteral(PREALLOC_REMOTE_TYPE) ||
2582-
(mRemoteType.EqualsLiteral(DEFAULT_REMOTE_TYPE) &&
2583-
aRemoteType.EqualsLiteral(DEFAULT_REMOTE_TYPE))));
2579+
MOZ_RELEASE_ASSERT(aRemoteType != FILE_REMOTE_TYPE &&
2580+
(mRemoteType == PREALLOC_REMOTE_TYPE ||
2581+
(mRemoteType == DEFAULT_REMOTE_TYPE &&
2582+
aRemoteType == DEFAULT_REMOTE_TYPE)));
25842583
} else {
25852584
// Initial setting of remote type. Either to 'prealloc' or the actual
25862585
// final type (if we didn't use a preallocated process)
25872586
MOZ_LOG(ContentParent::GetLog(), LogLevel::Debug,
25882587
("Setting remoteType of process %d to %s", getpid(),
2589-
NS_ConvertUTF16toUTF8(aRemoteType).get()));
2588+
aRemoteType.get()));
25902589
}
25912590

25922591
// Update the process name so about:memory's process names are more obvious.
2593-
if (aRemoteType.EqualsLiteral(FILE_REMOTE_TYPE)) {
2592+
if (aRemoteType == FILE_REMOTE_TYPE) {
25942593
SetProcessName(u"file:// Content"_ns);
2595-
} else if (aRemoteType.EqualsLiteral(EXTENSION_REMOTE_TYPE)) {
2594+
} else if (aRemoteType == EXTENSION_REMOTE_TYPE) {
25962595
SetProcessName(u"WebExtensions"_ns);
2597-
} else if (aRemoteType.EqualsLiteral(PRIVILEGEDABOUT_REMOTE_TYPE)) {
2596+
} else if (aRemoteType == PRIVILEGEDABOUT_REMOTE_TYPE) {
25982597
SetProcessName(u"Privileged Content"_ns);
2599-
} else if (aRemoteType.EqualsLiteral(LARGE_ALLOCATION_REMOTE_TYPE)) {
2598+
} else if (aRemoteType == LARGE_ALLOCATION_REMOTE_TYPE) {
26002599
SetProcessName(u"Large Allocation Web Content"_ns);
2601-
} else if (RemoteTypePrefix(aRemoteType)
2602-
.EqualsLiteral(FISSION_WEB_REMOTE_TYPE)) {
2600+
} else if (RemoteTypePrefix(aRemoteType) == FISSION_WEB_REMOTE_TYPE) {
26032601
SetProcessName(u"Isolated Web Content"_ns);
26042602
}
26052603
// else "prealloc", "web" or "webCOOP+COEP" type -> "Web Content" already set
@@ -2611,7 +2609,7 @@ mozilla::ipc::IPCResult ContentChild::RecvRemoteType(
26112609

26122610
// Call RemoteTypePrefix() on the result to remove URIs if you want to use this
26132611
// for telemetry.
2614-
const nsAString& ContentChild::GetRemoteType() const { return mRemoteType; }
2612+
const nsACString& ContentChild::GetRemoteType() const { return mRemoteType; }
26152613

26162614
mozilla::ipc::IPCResult ContentChild::RecvInitServiceWorkers(
26172615
const ServiceWorkerConfiguration& aConfig) {

0 commit comments

Comments
 (0)