diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:29 +0000 |
commit | 59203c63bb777a3bacec32fb8830fba33540e809 (patch) | |
tree | 58298e711c0ff0575818c30485b44a2f21bf28a0 /toolkit/components/antitracking/bouncetrackingprotection/BounceTrackingStateGlobal.cpp | |
parent | Adding upstream version 126.0.1. (diff) | |
download | firefox-59203c63bb777a3bacec32fb8830fba33540e809.tar.xz firefox-59203c63bb777a3bacec32fb8830fba33540e809.zip |
Adding upstream version 127.0.upstream/127.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/components/antitracking/bouncetrackingprotection/BounceTrackingStateGlobal.cpp')
-rw-r--r-- | toolkit/components/antitracking/bouncetrackingprotection/BounceTrackingStateGlobal.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/toolkit/components/antitracking/bouncetrackingprotection/BounceTrackingStateGlobal.cpp b/toolkit/components/antitracking/bouncetrackingprotection/BounceTrackingStateGlobal.cpp index b94c887c90..bcd9e57bd8 100644 --- a/toolkit/components/antitracking/bouncetrackingprotection/BounceTrackingStateGlobal.cpp +++ b/toolkit/components/antitracking/bouncetrackingprotection/BounceTrackingStateGlobal.cpp @@ -9,6 +9,7 @@ #include "ErrorList.h" #include "mozilla/Assertions.h" #include "mozilla/Logging.h" +#include "mozilla/IntegerPrintfMacros.h" #include "nsIPrincipal.h" namespace mozilla { @@ -42,6 +43,19 @@ nsresult BounceTrackingStateGlobal::RecordUserActivation( __FUNCTION__, PromiseFlatCString(aSiteHost).get())); } + // Make sure we don't overwrite an existing, more recent user activation. This + // is only relevant for callers that pass in a timestamp that isn't PR_Now(), + // e.g. when importing user activation data. + Maybe<PRTime> existingUserActivation = mUserActivation.MaybeGet(aSiteHost); + if (existingUserActivation.isSome() && + existingUserActivation.value() >= aTime) { + MOZ_LOG(gBounceTrackingProtectionLog, LogLevel::Debug, + ("%s: Skip: A more recent user activation " + "already exists for %s", + __FUNCTION__, PromiseFlatCString(aSiteHost).get())); + return NS_OK; + } + mUserActivation.InsertOrUpdate(aSiteHost, aTime); if (aSkipStorage || !ShouldPersistToDisk()) { |