зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1669731 - P1. Rename STATE_UNBLOCKED_UNSAFE_CONTENT to STATE_UNBLOCKED_TRACKING_CONTENT r=timhuang
unsafe content is for Safe Browsing(phishing, malware, etc), we should use tracking content instead. Differential Revision: https://phabricator.services.mozilla.com/D93269
This commit is contained in:
Родитель
2798413619
Коммит
d56e33dd5e
|
@ -110,7 +110,7 @@ var Fingerprinting = {
|
|||
|
||||
isShimming(state) {
|
||||
return (
|
||||
state & Ci.nsIWebProgressListener.STATE_UNBLOCKED_UNSAFE_CONTENT &&
|
||||
state & Ci.nsIWebProgressListener.STATE_UNBLOCKED_TRACKING_CONTENT &&
|
||||
this.isAllowing(state)
|
||||
);
|
||||
},
|
||||
|
@ -256,7 +256,7 @@ var Cryptomining = {
|
|||
|
||||
isShimming(state) {
|
||||
return (
|
||||
state & Ci.nsIWebProgressListener.STATE_UNBLOCKED_UNSAFE_CONTENT &&
|
||||
state & Ci.nsIWebProgressListener.STATE_UNBLOCKED_TRACKING_CONTENT &&
|
||||
this.isAllowing(state)
|
||||
);
|
||||
},
|
||||
|
@ -466,7 +466,7 @@ var TrackingProtection = {
|
|||
|
||||
isShimming(state) {
|
||||
return (
|
||||
state & Ci.nsIWebProgressListener.STATE_UNBLOCKED_UNSAFE_CONTENT &&
|
||||
state & Ci.nsIWebProgressListener.STATE_UNBLOCKED_TRACKING_CONTENT &&
|
||||
this.isAllowing(state)
|
||||
);
|
||||
},
|
||||
|
@ -1134,7 +1134,7 @@ var SocialTracking = {
|
|||
|
||||
isShimming(state) {
|
||||
return (
|
||||
state & Ci.nsIWebProgressListener.STATE_UNBLOCKED_UNSAFE_CONTENT &&
|
||||
state & Ci.nsIWebProgressListener.STATE_UNBLOCKED_TRACKING_CONTENT &&
|
||||
this.isAllowing(state)
|
||||
);
|
||||
},
|
||||
|
|
|
@ -146,7 +146,7 @@ UrlClassifierFeatureCryptominingProtection::ProcessChannel(
|
|||
if (ChannelClassifierService::OnBeforeBlockChannel(aChannel, mName, list) ==
|
||||
ChannelBlockDecision::Unblocked) {
|
||||
ContentBlockingNotifier::OnEvent(
|
||||
aChannel, nsIWebProgressListener::STATE_UNBLOCKED_UNSAFE_CONTENT,
|
||||
aChannel, nsIWebProgressListener::STATE_UNBLOCKED_TRACKING_CONTENT,
|
||||
false);
|
||||
*aShouldContinue = true;
|
||||
return NS_OK;
|
||||
|
|
|
@ -153,7 +153,7 @@ UrlClassifierFeatureFingerprintingProtection::ProcessChannel(
|
|||
if (ChannelClassifierService::OnBeforeBlockChannel(aChannel, mName, list) ==
|
||||
ChannelBlockDecision::Unblocked) {
|
||||
ContentBlockingNotifier::OnEvent(
|
||||
aChannel, nsIWebProgressListener::STATE_UNBLOCKED_UNSAFE_CONTENT,
|
||||
aChannel, nsIWebProgressListener::STATE_UNBLOCKED_TRACKING_CONTENT,
|
||||
false);
|
||||
*aShouldContinue = true;
|
||||
return NS_OK;
|
||||
|
|
|
@ -149,7 +149,7 @@ UrlClassifierFeatureSocialTrackingProtection::ProcessChannel(
|
|||
if (ChannelClassifierService::OnBeforeBlockChannel(aChannel, mName, list) ==
|
||||
ChannelBlockDecision::Unblocked) {
|
||||
ContentBlockingNotifier::OnEvent(
|
||||
aChannel, nsIWebProgressListener::STATE_UNBLOCKED_UNSAFE_CONTENT,
|
||||
aChannel, nsIWebProgressListener::STATE_UNBLOCKED_TRACKING_CONTENT,
|
||||
false);
|
||||
*aShouldContinue = true;
|
||||
return NS_OK;
|
||||
|
|
|
@ -153,7 +153,7 @@ UrlClassifierFeatureTrackingProtection::ProcessChannel(
|
|||
if (ChannelClassifierService::OnBeforeBlockChannel(aChannel, mName, list) ==
|
||||
ChannelBlockDecision::Unblocked) {
|
||||
ContentBlockingNotifier::OnEvent(
|
||||
aChannel, nsIWebProgressListener::STATE_UNBLOCKED_UNSAFE_CONTENT,
|
||||
aChannel, nsIWebProgressListener::STATE_UNBLOCKED_TRACKING_CONTENT,
|
||||
false);
|
||||
*aShouldContinue = true;
|
||||
return NS_OK;
|
||||
|
|
|
@ -158,7 +158,7 @@ Maybe<uint32_t> ContentBlockingLog::RecordLogParent(
|
|||
aTrackingFullHashes);
|
||||
break;
|
||||
|
||||
case nsIWebProgressListener::STATE_UNBLOCKED_UNSAFE_CONTENT:
|
||||
case nsIWebProgressListener::STATE_UNBLOCKED_TRACKING_CONTENT:
|
||||
RecordLogInternal(aOrigin, aType, blockedValue);
|
||||
break;
|
||||
|
||||
|
|
|
@ -332,6 +332,10 @@ interface nsIWebProgressListener : nsISupports
|
|||
*
|
||||
* STATE_LOADED_SOCIALTRACKING_CONTENT
|
||||
* SocialTracking content has been loaded.
|
||||
*
|
||||
* STATE_UNBLOCKED_TRACKING_CONTENT
|
||||
* Tracking content should be blocked from loading was unblocked.
|
||||
*
|
||||
*/
|
||||
const unsigned long STATE_BLOCKED_TRACKING_CONTENT = 0x00001000;
|
||||
const unsigned long STATE_LOADED_LEVEL_1_TRACKING_CONTENT = 0x00002000;
|
||||
|
@ -352,7 +356,7 @@ interface nsIWebProgressListener : nsISupports
|
|||
const unsigned long STATE_COOKIES_BLOCKED_FOREIGN = 0x00000080;
|
||||
const unsigned long STATE_BLOCKED_SOCIALTRACKING_CONTENT = 0x00010000;
|
||||
const unsigned long STATE_LOADED_SOCIALTRACKING_CONTENT = 0x00020000;
|
||||
const unsigned long STATE_UNBLOCKED_UNSAFE_CONTENT = 0x00000010;
|
||||
const unsigned long STATE_UNBLOCKED_TRACKING_CONTENT = 0x00000010;
|
||||
|
||||
/**
|
||||
* Flag for HTTPS-Only Mode upgrades
|
||||
|
|
Загрузка…
Ссылка в новой задаче