Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit a6a14f9

Browse files
committed
Backed out 2 changesets (bug 1575092) for causing Bug 1596556 and Bug 1596556.
Backed out changeset 8dc03b744500 (bug 1575092) Backed out changeset e28e46ca4a17 (bug 1575092)
1 parent e317a07 commit a6a14f9

4 files changed

Lines changed: 2 additions & 24 deletions

File tree

dom/ipc/ContentChild.cpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,17 +1350,7 @@ void ContentChild::InitXPCOM(
13501350

13511351
ClientManager::Startup();
13521352

1353-
// Respecting COOP and COEP requires processing headers in the parent process
1354-
// in order to choose an appropriate content process, but the workers'
1355-
// ScriptLoader processes headers in content processes. An intermediary step
1356-
// that provides security guarantees is to simply never allow SharedWorkers
1357-
// and ServiceWorkers to exist in a COOP+COEP process. The ultimate goal
1358-
// is to allow these worker types to be put in such processes based on their
1359-
// script response headers.
1360-
// https://bugzilla.mozilla.org/show_bug.cgi?id=1595206
1361-
if (!IsWebCoopCoepRemoteType(GetRemoteType())) {
1362-
RemoteWorkerService::Initialize();
1363-
}
1353+
RemoteWorkerService::Initialize();
13641354

13651355
nsCOMPtr<nsIConsoleService> svc(do_GetService(NS_CONSOLESERVICE_CONTRACTID));
13661356
if (!svc) {

dom/ipc/ContentParent.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -728,11 +728,6 @@ bool IsWebRemoteType(const nsAString& aContentProcessType) {
728728
NS_LITERAL_STRING(DEFAULT_REMOTE_TYPE));
729729
}
730730

731-
bool IsWebCoopCoepRemoteType(const nsAString& aContentProcessType) {
732-
return StringBeginsWith(aContentProcessType,
733-
NS_LITERAL_STRING(WITH_COOP_COEP_REMOTE_TYPE_PREFIX));
734-
}
735-
736731
/*static*/
737732
uint32_t ContentParent::GetMaxProcessCount(
738733
const nsAString& aContentProcessType) {

dom/ipc/ContentParent.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,8 +1398,6 @@ const nsDependentSubstring RemoteTypePrefix(
13981398
// This is based on isWebRemoteType in E10SUtils.jsm.
13991399
bool IsWebRemoteType(const nsAString& aContentProcessType);
14001400

1401-
bool IsWebCoopCoepRemoteType(const nsAString& aContentProcessType);
1402-
14031401
} // namespace dom
14041402
} // namespace mozilla
14051403

dom/workers/remoteworkers/RemoteWorkerManager.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,7 @@ RemoteWorkerManager::SelectTargetActorForServiceWorker(
239239
auto scopeExit = MakeScopeExit(
240240
[&] { contentParents.AppendElement(std::move(contentParent)); });
241241

242-
const nsAString& remoteType = contentParent->GetRemoteType();
243-
MOZ_DIAGNOSTIC_ASSERT(
244-
!IsWebCoopCoepRemoteType(remoteType),
245-
"COOP+COEP processes don't support remote workers right now");
246-
247-
if (IsWebRemoteType(remoteType)) {
242+
if (IsWebRemoteType(contentParent->GetRemoteType())) {
248243
auto lock = contentParent->mRemoteWorkerActorData.Lock();
249244

250245
if (lock->mCount || !lock->mShutdownStarted) {

0 commit comments

Comments
 (0)