Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 22:07:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1476324 - Storage activation via window.open(URL) applies across top-level domains - part 3 - annotate top-level channels, r=ehsan

Browse Source
This commit is contained in:
Andrea Marchesini 2018-07-18 15:44:55 +02:00
parent 7e0d9ec5c0
commit 3003d70341
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netwerk/base/nsChannelClassifier.cpp
View File

@ -42,6 +42,7 @@
#include "mozilla/Preferences.h" #include "mozilla/Preferences.h"
#include "mozilla/net/HttpBaseChannel.h" #include "mozilla/net/HttpBaseChannel.h"
#include "mozilla/ClearOnShutdown.h" #include "mozilla/ClearOnShutdown.h"
#include "mozilla/StaticPrefs.h"
#include "mozilla/Unused.h" #include "mozilla/Unused.h"
namespace mozilla { namespace mozilla {
@ -1014,7 +1015,8 @@ TrackingURICallback::OnTrackerFound(nsresult aErrorCode)
mChannelClassifier.get(), channel.get())); mChannelClassifier.get(), channel.get()));
channel->Cancel(aErrorCode); channel->Cancel(aErrorCode);
} else { } else {
MOZ_ASSERT(mChannelClassifier->ShouldEnableTrackingAnnotation()); MOZ_ASSERT(mChannelClassifier->ShouldEnableTrackingAnnotation() ||
StaticPrefs::privacy_restrict3rdpartystorage_enabled());
// Even with TP disabled, we still want to show the user that there // Even with TP disabled, we still want to show the user that there
// are unblocked trackers on the site, so notify the UI that we loaded // are unblocked trackers on the site, so notify the UI that we loaded
@ -1199,7 +1201,8 @@ nsChannelClassifier::CheckIsTrackerWithLocalTable(std::function<void()>&& aCallb
return rv; return rv;
} }
if (!ShouldEnableTrackingProtection() && !ShouldEnableTrackingAnnotation()) { if (!ShouldEnableTrackingProtection() && !ShouldEnableTrackingAnnotation() &&
!StaticPrefs::privacy_restrict3rdpartystorage_enabled()) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }