wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 769594 - Make nsContentUtils use TestPermissionFromPrincipal instead of TestPermission. r=sicking

Browse Source
This commit is contained in:
Mounir Lamouri 2012-07-18 11:38:02 -07:00
parent 87df7900f8
commit ebfb3f57c9
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
content/base/src/nsContentUtils.cpp
View File

@ -2774,17 +2774,9 @@ nsContentUtils::IsDraggableLink(const nsIContent* aContent) {
static bool
TestSitePerm(nsIPrincipal* aPrincipal, const char* aType, PRUint32 aPerm)
{
if (nsContentUtils::IsSystemPrincipal(aPrincipal)) {
// System principal is always allowed and never denied permission.
return aPerm == nsIPermissionManager::ALLOW_ACTION;
}
nsCOMPtr<nsIURI> uri;
if (NS_FAILED(!aPrincipal ||
aPrincipal->GetURI(getter_AddRefs(uri))) ||
!uri) {
// We always deny (i.e. don't allow) the permission if we don't
// have a principal or we don't know the URI.
if (!aPrincipal) {
// We always deny (i.e. don't allow) the permission if we don't have a
// principal.
return aPerm != nsIPermissionManager::ALLOW_ACTION;
}
@ -2793,9 +2785,9 @@ TestSitePerm(nsIPrincipal* aPrincipal, const char* aType, PRUint32 aPerm)
NS_ENSURE_TRUE(permMgr, false);
PRUint32 perm;
nsresult rv = permMgr->TestPermission(uri, aType, &perm);
nsresult rv = permMgr->TestPermissionFromPrincipal(aPrincipal, aType, &perm);
NS_ENSURE_SUCCESS(rv, false);
return perm == aPerm;
}