summaryrefslogtreecommitdiffstats
path: root/dom/base
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-30 22:57:23 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-30 22:57:23 +0200
commit74858918fa2445f7e4ebc4b615ec073d528039f1 (patch)
tree1ac596813ae2b6ab87488e04bdbda98d9d070b0d /dom/base
parent80edefc958f4216bb5982e48a58fd241c69a54db (diff)
downloadUXP-74858918fa2445f7e4ebc4b615ec073d528039f1.tar
UXP-74858918fa2445f7e4ebc4b615ec073d528039f1.tar.gz
UXP-74858918fa2445f7e4ebc4b615ec073d528039f1.tar.lz
UXP-74858918fa2445f7e4ebc4b615ec073d528039f1.tar.xz
UXP-74858918fa2445f7e4ebc4b615ec073d528039f1.zip
Bug 1329032 - Extend loadURIWithOptions by a triggeringPrincipal (without an hard e10s)
Diffstat (limited to 'dom/base')
-rw-r--r--dom/base/nsContentUtils.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index 76463df16..34c7d23b8 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -9776,9 +9776,13 @@ nsContentUtils::AttemptLargeAllocationLoad(nsIHttpChannel* aChannel)
rv = aChannel->GetReferrer(getter_AddRefs(referrer));
NS_ENSURE_SUCCESS(rv, false);
+ nsCOMPtr<nsILoadInfo> loadInfo = aChannel->GetLoadInfo();
+ nsCOMPtr<nsIPrincipal> triggeringPrincipal = loadInfo->TriggeringPrincipal();
+
// Actually perform the cross process load
bool reloadSucceeded = false;
- rv = wbc3->ReloadInFreshProcess(docShell, uri, referrer, &reloadSucceeded);
+ rv = wbc3->ReloadInFreshProcess(docShell, uri, referrer,
+ triggeringPrincipal, &reloadSucceeded);
NS_ENSURE_SUCCESS(rv, false);
return reloadSucceeded;