corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1501978 - Part 1: Stop honouring the browser.contentblocking.enabled pref in Gecko r=baku

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D10074
This commit is contained in:
Ehsan Akhgari
2018-10-30 14:30:15 +00:00
parent ddbe9eef60
commit 5e975a4a5f
29 changed files with 21 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docshell/base/nsDocShell.cpp
View File

@@ -12845,7 +12845,6 @@ nsDocShell::GetUseTrackingProtection(bool* aUseTrackingProtection)
{
*aUseTrackingProtection = false;
bool cbEnabled = StaticPrefs::browser_contentblocking_enabled();
static bool sTPEnabled = false;
static bool sTPInPBEnabled = false;
static bool sPrefsInit = false;
@@ -12858,8 +12857,8 @@ nsDocShell::GetUseTrackingProtection(bool* aUseTrackingProtection)
"privacy.trackingprotection.pbmode.enabled", false);
}
if (mUseTrackingProtection || (cbEnabled && sTPEnabled) ||
(cbEnabled && UsePrivateBrowsing() && sTPInPBEnabled)) {
if (mUseTrackingProtection || sTPEnabled ||
(UsePrivateBrowsing() && sTPInPBEnabled)) {
*aUseTrackingProtection = true;
return NS_OK;
}