Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug 306363 (Clean up nsContentUtils service getters). r/sr=bz.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@179982 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterv%propagandism.org
2005-09-11 10:08:43 +00:00
parent 8f39da2e1d
commit b64b04886f
45 changed files with 151 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/content/base/src/nsScriptLoader.cpp
View File

@@ -86,7 +86,7 @@ IntersectPrincipalCerts(nsIPrincipal *aOld, nsIPrincipal *aNew)
aOld->GetURI(getter_AddRefs(uri));
aOld->GetDomain(getter_AddRefs(domain));
nsContentUtils::GetSecurityManager()->GetCodebasePrincipal(uri, &principal);
nsContentUtils::SecurityManager()->GetCodebasePrincipal(uri, &principal);
if (principal && domain) {
principal->SetDomain(domain);
}
@@ -513,7 +513,7 @@ nsScriptLoader::ProcessScriptElement(nsIScriptElement *aElement,
if (!docPrincipal) {
return FireErrorNotification(NS_ERROR_UNEXPECTED, aElement, aObserver);
}
rv = nsContentUtils::GetSecurityManager()->
rv = nsContentUtils::SecurityManager()->
CheckLoadURIWithPrincipal(docPrincipal, scriptURI,
nsIScriptSecurityManager::ALLOW_CHROME);