[PALEMOON] Replace owner with triggeringPrincipal to match the updated UXP docshell

This commit is contained in:
JustOff 2018-04-30 17:24:47 +03:00 • committed by Roy Tam
commit ac6379189c
3 changed files with 4 additions and 4 deletions

View file

@ -83,7 +83,7 @@ function open()
var flags = webNav.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP | var flags = webNav.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP |
webNav.LOAD_FLAGS_FIXUP_SCHEME_TYPOS; webNav.LOAD_FLAGS_FIXUP_SCHEME_TYPOS;
if (!mayInheritPrincipal) if (!mayInheritPrincipal)
flags |= webNav.LOAD_FLAGS_DISALLOW_INHERIT_OWNER; flags |= webNav.LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL;
browser.gBrowser.loadURIWithFlags(url, flags, null, null, postData); browser.gBrowser.loadURIWithFlags(url, flags, null, null, postData);
break; break;
case "1": case "1":

View file

@ -305,12 +305,12 @@
function loadCurrent() { function loadCurrent() {
let flags = Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP; let flags = Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
// Pass LOAD_FLAGS_DISALLOW_INHERIT_OWNER to prevent any loads from // Pass LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL to prevent any loads from
// inheriting the currently loaded document's principal, unless this // inheriting the currently loaded document's principal, unless this
// URL is marked as safe to inherit (e.g. came from a bookmark // URL is marked as safe to inherit (e.g. came from a bookmark
// keyword). // keyword).
if (!mayInheritPrincipal) if (!mayInheritPrincipal)
flags |= Ci.nsIWebNavigation.LOAD_FLAGS_DISALLOW_INHERIT_OWNER; flags |= Ci.nsIWebNavigation.LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL;
// If the value wasn't typed, we know that we decoded the value as // If the value wasn't typed, we know that we decoded the value as
// UTF-8 (see losslessDecodeURI) // UTF-8 (see losslessDecodeURI)
if (!this.valueIsTyped) if (!this.valueIsTyped)

View file

@ -333,7 +333,7 @@ function openLinkIn(url, where, params) {
flags |= Ci.nsIWebNavigation.LOAD_FLAGS_FIXUP_SCHEME_TYPOS; flags |= Ci.nsIWebNavigation.LOAD_FLAGS_FIXUP_SCHEME_TYPOS;
} }
if (aDisallowInheritPrincipal) if (aDisallowInheritPrincipal)
flags |= Ci.nsIWebNavigation.LOAD_FLAGS_DISALLOW_INHERIT_OWNER; flags |= Ci.nsIWebNavigation.LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL;
if (aForceAllowDataURI) { if (aForceAllowDataURI) {
flags |= Ci.nsIWebNavigation.LOAD_FLAGS_FORCE_ALLOW_DATA_URI; flags |= Ci.nsIWebNavigation.LOAD_FLAGS_FORCE_ALLOW_DATA_URI;
} }