diff --git a/browser/base/content/browser-siteProtections.js b/browser/base/content/browser-siteProtections.js index e02f22a3f82e..8a51c8424086 100644 --- a/browser/base/content/browser-siteProtections.js +++ b/browser/base/content/browser-siteProtections.js @@ -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) ); }, diff --git a/netwerk/url-classifier/UrlClassifierFeatureCryptominingProtection.cpp b/netwerk/url-classifier/UrlClassifierFeatureCryptominingProtection.cpp index 9f1497a066e3..906f2de08666 100644 --- a/netwerk/url-classifier/UrlClassifierFeatureCryptominingProtection.cpp +++ b/netwerk/url-classifier/UrlClassifierFeatureCryptominingProtection.cpp @@ -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; diff --git a/netwerk/url-classifier/UrlClassifierFeatureFingerprintingProtection.cpp b/netwerk/url-classifier/UrlClassifierFeatureFingerprintingProtection.cpp index 6b96b3d77d38..fa2a8a9067d1 100644 --- a/netwerk/url-classifier/UrlClassifierFeatureFingerprintingProtection.cpp +++ b/netwerk/url-classifier/UrlClassifierFeatureFingerprintingProtection.cpp @@ -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; diff --git a/netwerk/url-classifier/UrlClassifierFeatureSocialTrackingProtection.cpp b/netwerk/url-classifier/UrlClassifierFeatureSocialTrackingProtection.cpp index b9d1dd4fc230..8a8cdcf49e4b 100644 --- a/netwerk/url-classifier/UrlClassifierFeatureSocialTrackingProtection.cpp +++ b/netwerk/url-classifier/UrlClassifierFeatureSocialTrackingProtection.cpp @@ -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; diff --git a/netwerk/url-classifier/UrlClassifierFeatureTrackingProtection.cpp b/netwerk/url-classifier/UrlClassifierFeatureTrackingProtection.cpp index 06a2548486d2..838065059ff4 100644 --- a/netwerk/url-classifier/UrlClassifierFeatureTrackingProtection.cpp +++ b/netwerk/url-classifier/UrlClassifierFeatureTrackingProtection.cpp @@ -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; diff --git a/toolkit/components/antitracking/ContentBlockingLog.cpp b/toolkit/components/antitracking/ContentBlockingLog.cpp index 30ac7e48e955..ee69ff75cce1 100644 --- a/toolkit/components/antitracking/ContentBlockingLog.cpp +++ b/toolkit/components/antitracking/ContentBlockingLog.cpp @@ -158,7 +158,7 @@ Maybe ContentBlockingLog::RecordLogParent( aTrackingFullHashes); break; - case nsIWebProgressListener::STATE_UNBLOCKED_UNSAFE_CONTENT: + case nsIWebProgressListener::STATE_UNBLOCKED_TRACKING_CONTENT: RecordLogInternal(aOrigin, aType, blockedValue); break; diff --git a/uriloader/base/nsIWebProgressListener.idl b/uriloader/base/nsIWebProgressListener.idl index bb979974bf64..4b46e1f5e72e 100644 --- a/uriloader/base/nsIWebProgressListener.idl +++ b/uriloader/base/nsIWebProgressListener.idl @@ -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