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

Bug 1083422 - Add triggering Principal to nsILoadInfo - update consumers (r=bz)

Browse Source
This commit is contained in:
Christoph Kerschbaumer 2014-11-14 08:57:26 -08:00
parent 59e7c4cbd1
commit ba415e054d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
caps/nsScriptSecurityManager.cpp
View File

@ -332,7 +332,7 @@ nsScriptSecurityManager::GetChannelResultPrincipal(nsIChannel* aChannel,
} }
if (loadInfo->GetForceInheritPrincipal()) { if (loadInfo->GetForceInheritPrincipal()) {
NS_ADDREF(*aPrincipal = loadInfo->LoadingPrincipal()); NS_ADDREF(*aPrincipal = loadInfo->TriggeringPrincipal());
return NS_OK; return NS_OK;
} }
} }

2
docshell/base/nsDocShell.cpp
View File

@ -11590,7 +11590,7 @@ nsDocShell::AddToSessionHistory(nsIURI * aURI, nsIChannel * aChannel,
owner = nsNullPrincipal::CreateWithInheritedAttributes(loadInfo->LoadingPrincipal()); owner = nsNullPrincipal::CreateWithInheritedAttributes(loadInfo->LoadingPrincipal());
NS_ENSURE_TRUE(owner, NS_ERROR_FAILURE); NS_ENSURE_TRUE(owner, NS_ERROR_FAILURE);
} else if (loadInfo->GetForceInheritPrincipal()) { } else if (loadInfo->GetForceInheritPrincipal()) {
owner = loadInfo->LoadingPrincipal(); owner = loadInfo->TriggeringPrincipal();
} }
} }
} }

2
dom/jsurl/nsJSProtocolHandler.cpp
View File

@ -157,7 +157,7 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel,
nsCOMPtr<nsILoadInfo> loadInfo; nsCOMPtr<nsILoadInfo> loadInfo;
aChannel->GetLoadInfo(getter_AddRefs(loadInfo)); aChannel->GetLoadInfo(getter_AddRefs(loadInfo));
if (loadInfo && loadInfo->GetForceInheritPrincipal()) { if (loadInfo && loadInfo->GetForceInheritPrincipal()) {
principal = loadInfo->LoadingPrincipal(); principal = loadInfo->TriggeringPrincipal();
} else { } else {
// No execution without a principal! // No execution without a principal!
NS_ASSERTION(!owner, "Non-principal owner?"); NS_ASSERTION(!owner, "Non-principal owner?");