diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-30 22:57:23 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-30 22:57:23 +0200 |
| commit | 74858918fa2445f7e4ebc4b615ec073d528039f1 (patch) | |
| tree | 1ac596813ae2b6ab87488e04bdbda98d9d070b0d /browser/components/sessionstore | |
| parent | 80edefc958f4216bb5982e48a58fd241c69a54db (diff) | |
| download | UXP-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 'browser/components/sessionstore')
| -rw-r--r-- | browser/components/sessionstore/ContentRestore.jsm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/browser/components/sessionstore/ContentRestore.jsm b/browser/components/sessionstore/ContentRestore.jsm index 976016770..d4972bcaf 100644 --- a/browser/components/sessionstore/ContentRestore.jsm +++ b/browser/components/sessionstore/ContentRestore.jsm @@ -204,6 +204,9 @@ ContentRestoreInternal.prototype = { : Ci.nsIHttpChannel.REFERRER_POLICY_DEFAULT); let postData = loadArguments.postData ? Utils.makeInputStream(loadArguments.postData) : null; + let triggeringPrincipal = loadArguments.triggeringPrincipal + ? Utils.deserializePrincipal(loadArguments.triggeringPrincipal) + : null; if (loadArguments.userContextId) { webNavigation.setOriginAttributesBeforeLoading({ userContextId: loadArguments.userContextId }); @@ -211,7 +214,7 @@ ContentRestoreInternal.prototype = { webNavigation.loadURIWithOptions(loadArguments.uri, loadArguments.flags, referrer, referrerPolicy, postData, - null, null); + null, null, triggeringPrincipal); } else if (tabData.userTypedValue && tabData.userTypedClear) { // If the user typed a URL into the URL bar and hit enter right before // we crashed, we want to start loading that page again. A non-zero |