Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1491835 - Store User-Interaction for AntiTracking purposes - part 1 - nsIDocument::SetUserHasInteracted should not receive a parameter, r=ehsan

Browse Source
This commit is contained in:
Andrea Marchesini 2018-09-24 12:54:54 +02:00
parent 68a73ded70
commit 55aa7576b0
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom/base/nsDocument.cpp
View File

@ -12622,20 +12622,22 @@ nsIDocument::ReportHasScrollLinkedEffect()
}
void
nsIDocument::SetUserHasInteracted(bool aUserHasInteracted)
nsIDocument::SetUserHasInteracted()
{
MOZ_LOG(gUserInteractionPRLog, LogLevel::Debug,
("Document %p has been interacted by user.", this));
mUserHasInteracted = aUserHasInteracted;
if (mUserHasInteracted) {
return;
}
mUserHasInteracted = true;
nsCOMPtr<nsILoadInfo> loadInfo = mChannel ? mChannel->GetLoadInfo() : nullptr;
if (loadInfo) {
loadInfo->SetDocumentHasUserInteracted(aUserHasInteracted);
loadInfo->SetDocumentHasUserInteracted(true);
}
if (aUserHasInteracted) {
MaybeAllowStorageForOpener();
}
MaybeAllowStorageForOpener();
}
void

2
dom/base/nsIDocument.h
View File

@ -3500,7 +3500,7 @@ public:
// Called to track whether this document has had any interaction.
// This is used to track whether we should permit "beforeunload".
void SetUserHasInteracted(bool aUserHasInteracted);
void SetUserHasInteracted();
bool UserHasInteracted()
{
return mUserHasInteracted;

2
dom/events/EventStateManager.cpp
View File

@ -505,7 +505,7 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext,
aEvent->mMessage == ePointerUp)) {
nsIDocument* doc = node->OwnerDoc();
while (doc && !doc->UserHasInteracted()) {
doc->SetUserHasInteracted(true);
doc->SetUserHasInteracted();
doc = nsContentUtils::IsChildOfSameType(doc) ?
doc->GetParentDocument() : nullptr;
}

4
dom/html/nsHTMLDocument.cpp
View File

@ -3418,7 +3418,5 @@ nsHTMLDocument::GetFormsAndFormControls(nsContentList** aFormList,
void
nsHTMLDocument::UserInteractionForTesting()
{
if (!UserHasInteracted()) {
SetUserHasInteracted(true);
}
SetUserHasInteracted();
}