зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 2 changesets (bug 1524992) for multiple failures and timeout on a CLOSED TREE
Backed out changeset fb1d7e57e253 (bug 1524992) Backed out changeset bd215cd3c8d7 (bug 1524992)
This commit is contained in:
Родитель
d2152481ed
Коммит
5a9b738453
|
@ -1692,7 +1692,6 @@ 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) {
|
||||
|
|
|
@ -1486,7 +1486,6 @@ window._gBrowser = {
|
|||
triggeringPrincipal,
|
||||
csp,
|
||||
userContextId,
|
||||
fromExternal,
|
||||
} = {}) {
|
||||
if (!aURIs.length) {
|
||||
return;
|
||||
|
@ -1538,9 +1537,6 @@ 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,
|
||||
|
@ -1563,7 +1559,6 @@ window._gBrowser = {
|
|||
triggeringPrincipal,
|
||||
bulkOrderedOpen: multiple,
|
||||
csp,
|
||||
fromExternal,
|
||||
};
|
||||
if (newIndex > -1) {
|
||||
params.index = newIndex;
|
||||
|
@ -1585,7 +1580,6 @@ window._gBrowser = {
|
|||
triggeringPrincipal,
|
||||
bulkOrderedOpen: true,
|
||||
csp,
|
||||
fromExternal,
|
||||
};
|
||||
if (targetTabIndex > -1) {
|
||||
params.index = ++tabNum;
|
||||
|
|
|
@ -149,12 +149,6 @@ nsAboutRedirector::NewChannel(nsIURI* aURI, nsILoadInfo* aLoadInfo,
|
|||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
if (path.EqualsASCII("crashparent") || path.EqualsASCII("crashcontent")) {
|
||||
bool isExternal;
|
||||
aLoadInfo->GetLoadTriggeredFromExternal(&isExternal);
|
||||
if (isExternal) {
|
||||
return NS_ERROR_NOT_AVAILABLE;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIChannel> channel = new CrashChannel(aURI);
|
||||
channel->SetLoadInfo(aLoadInfo);
|
||||
channel.forget(aResult);
|
||||
|
|
Загрузка…
Ссылка в новой задаче