Backed out 11 changesets (bug 1731982, bug 1736401) for causing crashes in mozilla::dom::ClientHandle::Control. a=backout
Backed out changeset 83176c86784c (bug 1736401) Backed out changeset 4826707af5b3 (bug 1731982) Backed out changeset a748e43fada0 (bug 1731982) Backed out changeset 49302f7705a4 (bug 1731982) Backed out changeset 59a5860fd74d (bug 1731982) Backed out changeset 1f7ec5f62c7c (bug 1731982) Backed out changeset 3142414872de (bug 1731982) Backed out changeset 363ae2df245d (bug 1731982) Backed out changeset ae319f8182ac (bug 1731982) Backed out changeset 23edbfc8e84a (bug 1731982) Backed out changeset 5f35364352f0 (bug 1731982)
This commit is contained in:
@@ -2445,14 +2445,8 @@ void nsDocShell::MaybeCreateInitialClientSource(nsIPrincipal* aPrincipal) {
|
||||
return;
|
||||
}
|
||||
|
||||
// We cannot get inherited foreign partitioned principal here. Instead, we
|
||||
// directly check which principal we want to inherit for the service worker.
|
||||
nsIPrincipal* principal =
|
||||
aPrincipal
|
||||
? aPrincipal
|
||||
: GetInheritedPrincipal(
|
||||
false, StoragePrincipalHelper::
|
||||
ShouldUsePartitionPrincipalForServiceWorker(this));
|
||||
aPrincipal ? aPrincipal : GetInheritedPrincipal(false);
|
||||
|
||||
// Sometimes there is no principal available when we are called from
|
||||
// CreateAboutBlankContentViewer. For example, sometimes the principal
|
||||
@@ -6624,14 +6618,7 @@ nsresult nsDocShell::CreateAboutBlankContentViewer(
|
||||
partitionedPrincipal = aPartitionedPrincipal;
|
||||
}
|
||||
|
||||
// We cannot get the foreign partitioned prinicpal for the initial
|
||||
// about:blank page. So, we change to check if we need to use the
|
||||
// partitioned principal for the service worker here.
|
||||
MaybeCreateInitialClientSource(
|
||||
StoragePrincipalHelper::ShouldUsePartitionPrincipalForServiceWorker(
|
||||
this)
|
||||
? partitionedPrincipal
|
||||
: principal);
|
||||
MaybeCreateInitialClientSource(principal);
|
||||
|
||||
// generate (about:blank) document to load
|
||||
blankDoc = nsContentDLF::CreateBlankDocument(mLoadGroup, principal,
|
||||
|
||||
Reference in New Issue
Block a user