Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 02:35:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1524992 - Treat command line URIs as external r=mconley

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D20890

--HG--
extra : moz-landing-system : lando
This commit is contained in:
James Willcox 2019-02-27 15:57:44 +00:00
parent 027f2c1a08
commit 867ec83b7d
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/base/content/browser.js
View File

@ -1692,6 +1692,7 @@ var gBrowserInit = {
triggeringPrincipal: window.arguments[8] || Services.scriptSecurityManager.getSystemPrincipal(),
allowInheritPrincipal: window.arguments[9],
csp: window.arguments[10],
fromExternal: true,
});
} catch (e) {}
} else if (window.arguments.length >= 3) {

6
browser/base/content/tabbrowser.js
View File

@ -1486,6 +1486,7 @@ window._gBrowser = {
triggeringPrincipal,
csp,
userContextId,
fromExternal,
} = {}) {
if (!aURIs.length) {
return;
@ -1537,6 +1538,9 @@ window._gBrowser = {
if (!allowInheritPrincipal) {
flags |= Ci.nsIWebNavigation.LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL;
}
if (fromExternal) {
flags |= Ci.nsIWebNavigation.LOAD_FLAGS_FROM_EXTERNAL;
}
try {
browser.loadURI(aURIs[0], {
flags,
@ -1559,6 +1563,7 @@ window._gBrowser = {
triggeringPrincipal,
bulkOrderedOpen: multiple,
csp,
fromExternal,
};
if (newIndex > -1) {
params.index = newIndex;
@ -1580,6 +1585,7 @@ window._gBrowser = {
triggeringPrincipal,
bulkOrderedOpen: true,
csp,
fromExternal,
};
if (targetTabIndex > -1) {
params.index = ++tabNum;