mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1580764: Part 3 - Remove unused AncestorOuterWindowIDs from LoadInfo. r=nika 

Differential Revision: https://phabricator.services.mozilla.com/D82465
This commit is contained in:
Kris Maglione 2020-07-07 21:14:34 +00:00
Родитель bd94db4e9a
Коммит 5837ad4bdd
5 изменённых файлов: 6 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
ipc/glue/BackgroundUtils.cpp
Просмотреть файл

@ -665,7 +665,6 @@ nsresult LoadInfoArgsToLoadInfo(
nsTArray<nsCOMPtr<nsIPrincipal>> ancestorPrincipals;
nsTArray<uint64_t> ancestorBrowsingContextIDs;
nsTArray<uint64_t> ancestorOuterWindowIDs;
if (XRE_IsParentProcess() &&
(nsContentUtils::InternalContentPolicyTypeToExternal(
loadInfoArgs.contentPolicyType()) !=
@ -676,8 +675,7 @@ nsresult LoadInfoArgsToLoadInfo(
BrowsingContext::Get(loadInfoArgs.browsingContextID());
if (parentBC) {
LoadInfo::ComputeAncestors(parentBC->Canonical(), ancestorPrincipals,
ancestorBrowsingContextIDs,
ancestorOuterWindowIDs);
ancestorBrowsingContextIDs);
}
}
@ -759,7 +757,7 @@ nsresult LoadInfoArgsToLoadInfo(
loadInfoArgs.isFormSubmission(), loadInfoArgs.sendCSPViolationEvents(),
loadInfoArgs.originAttributes(), redirectChainIncludingInternalRedirects,
redirectChain, std::move(ancestorPrincipals), ancestorBrowsingContextIDs,
ancestorOuterWindowIDs, loadInfoArgs.corsUnsafeHeaders(),
loadInfoArgs.corsUnsafeHeaders(),
loadInfoArgs.forcePreflight(), loadInfoArgs.isPreflight(),
loadInfoArgs.loadTriggeredFromExternal(),
loadInfoArgs.serviceWorkerTaintingSynthesized(),

15
netwerk/base/LoadInfo.cpp
Просмотреть файл

@ -606,8 +606,7 @@ LoadInfo::LoadInfo(dom::WindowGlobalParent* aParentWGP,
mLoadingEmbedderPolicy(nsILoadInfo::EMBEDDER_POLICY_NULL) {
CanonicalBrowsingContext* parentBC = aParentWGP->BrowsingContext();
MOZ_ASSERT(parentBC);
ComputeAncestors(parentBC, mAncestorPrincipals, mAncestorBrowsingContextIDs,
mAncestorOuterWindowIDs);
ComputeAncestors(parentBC, mAncestorPrincipals, mAncestorBrowsingContextIDs);
RefPtr<WindowGlobalParent> topLevelWGP = aParentWGP->TopWindowContext();
@ -779,7 +778,6 @@ LoadInfo::LoadInfo(const LoadInfo& rhs)
mRedirectChain(rhs.mRedirectChain.Clone()),
mAncestorPrincipals(rhs.mAncestorPrincipals.Clone()),
mAncestorBrowsingContextIDs(rhs.mAncestorBrowsingContextIDs.Clone()),
mAncestorOuterWindowIDs(rhs.mAncestorOuterWindowIDs.Clone()),
mCorsUnsafeHeaders(rhs.mCorsUnsafeHeaders.Clone()),
mRequestBlockingReason(rhs.mRequestBlockingReason),
mForcePreflight(rhs.mForcePreflight),
@ -832,7 +830,6 @@ LoadInfo::LoadInfo(
RedirectHistoryArray& aRedirectChain,
nsTArray<nsCOMPtr<nsIPrincipal>>&& aAncestorPrincipals,
const nsTArray<uint64_t>& aAncestorBrowsingContextIDs,
const nsTArray<uint64_t>& aAncestorOuterWindowIDs,
const nsTArray<nsCString>& aCorsUnsafeHeaders, bool aForcePreflight,
bool aIsPreflight, bool aLoadTriggeredFromExternal,
bool aServiceWorkerTaintingSynthesized, bool aDocumentHasUserInteracted,
@ -888,7 +885,6 @@ LoadInfo::LoadInfo(
mOriginAttributes(aOriginAttributes),
mAncestorPrincipals(std::move(aAncestorPrincipals)),
mAncestorBrowsingContextIDs(aAncestorBrowsingContextIDs.Clone()),
mAncestorOuterWindowIDs(aAncestorOuterWindowIDs.Clone()),
mCorsUnsafeHeaders(aCorsUnsafeHeaders.Clone()),
mRequestBlockingReason(aRequestBlockingReason),
mForcePreflight(aForcePreflight),
@ -924,9 +920,9 @@ LoadInfo::LoadInfo(
void LoadInfo::ComputeAncestors(
CanonicalBrowsingContext* aBC,
nsTArray<nsCOMPtr<nsIPrincipal>>& aAncestorPrincipals,
nsTArray<uint64_t>& aBrowsingContextIDs,
nsTArray<uint64_t>& aOuterWindowIDs) {
nsTArray<uint64_t>& aBrowsingContextIDs) {
MOZ_ASSERT(aAncestorPrincipals.IsEmpty());
MOZ_ASSERT(aBrowsingContextIDs.IsEmpty());
CanonicalBrowsingContext* ancestorBC = aBC;
// Iterate over ancestor WindowGlobalParents, collecting principals and outer
// window IDs.
@ -938,7 +934,6 @@ void LoadInfo::ComputeAncestors(
MOZ_ASSERT(parentPrincipal, "Ancestor principal is null");
aAncestorPrincipals.AppendElement(parentPrincipal.forget());
aBrowsingContextIDs.AppendElement(ancestorBC->Id());
aOuterWindowIDs.AppendElement(ancestorWGP->OuterWindowId());
}
}
void LoadInfo::ComputeIsThirdPartyContext(nsPIDOMWindowOuter* aOuterWindow) {
@ -1623,10 +1618,6 @@ const nsTArray<uint64_t>& LoadInfo::AncestorBrowsingContextIDs() {
return mAncestorBrowsingContextIDs;
}
const nsTArray<uint64_t>& LoadInfo::AncestorOuterWindowIDs() {
return mAncestorOuterWindowIDs;
}
void LoadInfo::SetCorsPreflightInfo(const nsTArray<nsCString>& aHeaders,
bool aForcePreflight) {
MOZ_ASSERT(GetSecurityMode() == nsILoadInfo::SEC_REQUIRE_CORS_DATA_INHERITS);

5
netwerk/base/LoadInfo.h
Просмотреть файл

@ -95,8 +95,7 @@ class LoadInfo final : public nsILoadInfo {
static void ComputeAncestors(
dom::CanonicalBrowsingContext* aBC,
nsTArray<nsCOMPtr<nsIPrincipal>>& aAncestorPrincipals,
nsTArray<uint64_t>& aBrowsingContextIDs,
nsTArray<uint64_t>& aOuterWindowIDs);
nsTArray<uint64_t>& aBrowsingContextIDs);
// create an exact copy of the loadinfo
already_AddRefed<nsILoadInfo> Clone() const;
@ -179,7 +178,6 @@ class LoadInfo final : public nsILoadInfo {
RedirectHistoryArray& aRedirectChain,
nsTArray<nsCOMPtr<nsIPrincipal>>&& aAncestorPrincipals,
const nsTArray<uint64_t>& aAncestorBrowsingContextIDs,
const nsTArray<uint64_t>& aAncestorOuterWindowIDs,
const nsTArray<nsCString>& aUnsafeHeaders, bool aForcePreflight,
bool aIsPreflight, bool aLoadTriggeredFromExternal,
bool aServiceWorkerTaintingSynthesized,
@ -276,7 +274,6 @@ class LoadInfo final : public nsILoadInfo {
RedirectHistoryArray mRedirectChain;
nsTArray<nsCOMPtr<nsIPrincipal>> mAncestorPrincipals;
nsTArray<uint64_t> mAncestorBrowsingContextIDs;
nsTArray<uint64_t> mAncestorOuterWindowIDs;
nsTArray<nsCString> mCorsUnsafeHeaders;
uint32_t mRequestBlockingReason;
bool mForcePreflight;

4
netwerk/base/TRRLoadInfo.cpp
Просмотреть файл

@ -421,10 +421,6 @@ const nsTArray<uint64_t>& TRRLoadInfo::AncestorBrowsingContextIDs() {
return mEmptyBrowsingContextIDs;
}
const nsTArray<uint64_t>& TRRLoadInfo::AncestorOuterWindowIDs() {
return mEmptyBrowsingContextIDs;
}
void TRRLoadInfo::SetCorsPreflightInfo(const nsTArray<nsCString>& aHeaders,
bool aForcePreflight) {}

10
netwerk/base/nsILoadInfo.idl
Просмотреть файл

@ -910,16 +910,6 @@ interface nsILoadInfo : nsISupports
[noscript, notxpcom, nostdcall]
Uint64ArrayRef AncestorBrowsingContextIDs();
/**
* Like AncestorBrowsingContextIDs, but with outer window IDs rather than
* BrowsingContext IDs. Deprecated.
*
* Please note that this array has the same lifetime as the
* loadInfo object - use with caution!
*/
[noscript, notxpcom, nostdcall]
Uint64ArrayRef AncestorOuterWindowIDs();
/**
* Sets the list of unsafe headers according to CORS spec, as well as
* potentially forces a preflight.