corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1835907, part 5 - Refactor the window's mStorageAccessPermissionGranted variable and its Getters to a more accurate name: mUsingStorageAccess - r=anti-tracking-reviewers,pbz

Browse Source 
This probably should have been done earlier, but became obvious with uses of Document::HasStorageAccessPermissionGrated in this stack.

Differential Revision: https://phabricator.services.mozilla.com/D184825
This commit is contained in:
Benjamin VanderSloot
2023-08-14 18:02:47 +00:00
parent 598a8c5467
commit dfe479593f
16 changed files with 40 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docshell/base/nsDocShell.cpp
View File

@@ -4018,8 +4018,7 @@ nsresult nsDocShell::LoadErrorPage(nsIURI* aErrorURI, nsIURI* aFailedURI,
mBrowsingContext->GetCurrentInnerWindowId());
nsPIDOMWindowInner* innerWin = mScriptGlobal->GetCurrentInnerWindow();
if (innerWin) {
loadState->SetTriggeringStorageAccess(
innerWin->HasStorageAccessPermissionGranted());
loadState->SetTriggeringStorageAccess(innerWin->UsingStorageAccess());
}
}
loadState->SetLoadType(LOAD_ERROR_PAGE);
@@ -4208,7 +4207,7 @@ nsresult nsDocShell::ReloadDocument(nsDocShell* aDocShell, Document* aDocument,
nsCOMPtr<nsIContentSecurityPolicy> csp = aDocument->GetCsp();
uint32_t triggeringSandboxFlags = aDocument->GetSandboxFlags();
uint64_t triggeringWindowId = aDocument->InnerWindowID();
bool triggeringStorageAccess = aDocument->HasStorageAccessPermissionGranted();
bool triggeringStorageAccess = aDocument->UsingStorageAccess();
nsAutoString contentTypeHint;
aDocument->GetContentType(contentTypeHint);
@@ -5245,8 +5244,7 @@ nsDocShell::ForceRefreshURI(nsIURI* aURI, nsIPrincipal* aPrincipal,
doc->HasValidTransientUserGestureActivation());
loadState->SetTriggeringSandboxFlags(doc->GetSandboxFlags());
loadState->SetTriggeringWindowId(doc->InnerWindowID());
loadState->SetTriggeringStorageAccess(
doc->HasStorageAccessPermissionGranted());
loadState->SetTriggeringStorageAccess(doc->UsingStorageAccess());
}
loadState->SetPrincipalIsExplicit(true);
@@ -10535,7 +10533,7 @@ nsresult nsDocShell::DoURILoad(nsDocShellLoadState* aLoadState,
Document* contextDoc = context->GetExtantDoc();
if (contextDoc) {
aLoadState->SetTriggeringStorageAccess(
contextDoc->HasStorageAccessPermissionGranted());
contextDoc->UsingStorageAccess());
}
}
}
@@ -13072,8 +13070,7 @@ nsresult nsDocShell::OnLinkClickSync(nsIContent* aContent,
if (mBrowsingContext) {
triggeringSandboxFlags = aContent->OwnerDoc()->GetSandboxFlags();
triggeringWindowId = aContent->OwnerDoc()->InnerWindowID();
triggeringStorageAccess =
aContent->OwnerDoc()->HasStorageAccessPermissionGranted();
triggeringStorageAccess = aContent->OwnerDoc()->UsingStorageAccess();
}
uint32_t flags = INTERNAL_LOAD_FLAGS_NONE;