Bug 1649686 - Test whether webCOOP+COEP is a prefix before testing whether web is a prefix;r=Yoric

Differential Revision: https://phabricator.services.mozilla.com/D83386
This commit is contained in:
Bruno Bartolomasi 2020-07-22 09:38:49 +00:00
Родитель d453512bbb
Коммит 31220a63a4
1 изменённых файлов: 6 добавлений и 5 удалений

Просмотреть файл

@ -849,9 +849,13 @@ already_AddRefed<Promise> ChromeUtils::RequestProcInfo(GlobalObject& aGlobal,
nsAutoCString remoteType(contentParent->GetRemoteType());
if (StringBeginsWith(remoteType, FISSION_WEB_REMOTE_TYPE)) {
// WARNING: Do not change the order, as
// `DEFAULT_REMOTE_TYPE` is a prefix of
// `FISSION_WEB_REMOTE_TYPE`.
// `DEFAULT_REMOTE_TYPE` is a prefix of both
// 'FISSION_WEB_REMOTE_TYPE' and
// `WITH_COOP_COEP_REMOTE_TYPE_PREFIX`.
type = mozilla::ProcType::WebIsolated;
} else if (StringBeginsWith(remoteType,
WITH_COOP_COEP_REMOTE_TYPE_PREFIX)) {
type = mozilla::ProcType::WebCOOPCOEP;
} else if (StringBeginsWith(remoteType, DEFAULT_REMOTE_TYPE)) {
type = mozilla::ProcType::Web;
} else if (remoteType == FILE_REMOTE_TYPE) {
@ -862,9 +866,6 @@ already_AddRefed<Promise> ChromeUtils::RequestProcInfo(GlobalObject& aGlobal,
type = mozilla::ProcType::PrivilegedAbout;
} else if (remoteType == PRIVILEGEDMOZILLA_REMOTE_TYPE) {
type = mozilla::ProcType::PrivilegedMozilla;
} else if (StringBeginsWith(remoteType,
WITH_COOP_COEP_REMOTE_TYPE_PREFIX)) {
type = mozilla::ProcType::WebCOOPCOEP;
} else if (remoteType == LARGE_ALLOCATION_REMOTE_TYPE) {
type = mozilla::ProcType::WebLargeAllocation;
} else if (remoteType == PREALLOC_REMOTE_TYPE) {