Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 21:28:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1574473 - Updated nsContentBlocker::TestPermission to use LegacyTestPermissionFromURI. r=Ehsan

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Paul Zuehlcke 2019-09-19 17:06:29 +00:00
parent ac0da8b368
commit 7dbb6cb72e
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/permissions/nsContentBlocker.cpp
View File

@ -86,10 +86,12 @@ nsContentBlocker::nsContentBlocker() {
}
nsresult nsContentBlocker::Init() {
nsresult rv;
mPermissionManager = do_GetService(NS_PERMISSIONMANAGER_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
mPermissionManager = nsPermissionManager::GetInstance();
if (!mPermissionManager) {
return NS_ERROR_NULL_POINTER;
}
nsresult rv;
nsCOMPtr<nsIPrefService> prefService =
do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
@ -292,8 +294,8 @@ nsresult nsContentBlocker::TestPermission(nsIURI* aCurrentURI,
// preload permission.
uint32_t permission = nsIPermissionManager::UNKNOWN_ACTION;
if (mPermissionManager->GetHasPreloadPermissions()) {
rv = mPermissionManager->TestPermission(
aCurrentURI, kTypeString[aContentType - 1], &permission);
rv = mPermissionManager->LegacyTestPermissionFromURI(
aCurrentURI, nullptr, kTypeString[aContentType - 1], &permission);
NS_ENSURE_SUCCESS(rv, rv);
}

4
extensions/permissions/nsContentBlocker.h
View File

@ -7,7 +7,7 @@
#include "nsIContentPolicy.h"
#include "nsIObserver.h"
#include "nsWeakReference.h"
#include "nsIPermissionManager.h"
#include "nsPermissionManager.h"
#include "nsIPrefBranch.h"
#include "mozilla/Attributes.h"
@ -35,7 +35,7 @@ class nsContentBlocker final : public nsIContentPolicy,
int32_t aContentType, bool* aPermission,
bool* aFromPrefs);
nsCOMPtr<nsIPermissionManager> mPermissionManager;
RefPtr<nsPermissionManager> mPermissionManager;
nsCOMPtr<nsIPrefBranch> mPrefBranchInternal;
static uint8_t mBehaviorPref[];
};