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

Bug 1282882 - Remove LoadContextInfo and LoadContext private browsing flags; r=jdm,mayhemer

Browse Source
This commit is contained in:
James Andreou
2016-08-23 18:07:56 -04:00
committed by Ehsan Akhgari
parent f937c8d3ec
commit ec9db2689b
17 changed files with 48 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docshell/base/LoadContext.cpp
View File

@@ -52,13 +52,11 @@ LoadContext::LoadContext(nsIPrincipal* aPrincipal,
{
PrincipalOriginAttributes poa = BasePrincipal::Cast(aPrincipal)->OriginAttributesRef();
mOriginAttributes.InheritFromDocToChildDocShell(poa);
mUsePrivateBrowsing = (poa.mPrivateBrowsingId != 0);
if (!aOptionalBase) {
return;
}
MOZ_ALWAYS_SUCCEEDS(aOptionalBase->GetIsContent(&mIsContent));
MOZ_ALWAYS_SUCCEEDS(aOptionalBase->GetUsePrivateBrowsing(&mUsePrivateBrowsing));
MOZ_ALWAYS_SUCCEEDS(aOptionalBase->GetUseRemoteTabs(&mUseRemoteTabs));
}
@@ -127,7 +125,7 @@ LoadContext::GetUsePrivateBrowsing(bool* aUsePrivateBrowsing)
NS_ENSURE_ARG_POINTER(aUsePrivateBrowsing);
*aUsePrivateBrowsing = mUsePrivateBrowsing;
*aUsePrivateBrowsing = mOriginAttributes.mPrivateBrowsingId > 0;
return NS_OK;
}
@@ -209,7 +207,7 @@ LoadContext::IsTrackingProtectionOn(bool* aIsTrackingProtectionOn)
if (Preferences::GetBool("privacy.trackingprotection.enabled", false)) {
*aIsTrackingProtectionOn = true;
} else if (mUsePrivateBrowsing &&
} else if ((mOriginAttributes.mPrivateBrowsingId > 0) &&
Preferences::GetBool("privacy.trackingprotection.pbmode.enabled", false)) {
*aIsTrackingProtectionOn = true;
} else {