Skip to content

Commit c59ca04

Browse files
nbeleuzunbeleuzu
committed
Backed out changeset b3538b7016aa (bug 1599438) for bustages on TestHttpFuzzing.cpp . CLOSED TREE
1 parent 6724b78 commit c59ca04

23 files changed

+106
-132
lines changed

‎docshell/base/nsDocShell.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7732,8 +7732,7 @@ nsresult nsDocShell::CreateContentViewer(const nsACString& aContentType,
77327732
// Mark the channel as being a document URI...
77337733
aOpenedChannel->GetLoadFlags(&loadFlags);
77347734
loadFlags |= nsIChannel::LOAD_DOCUMENT_URI;
7735-
nsCOMPtr<nsILoadInfo> loadInfo = aOpenedChannel->LoadInfo();
7736-
if (SandboxFlagsImplyCookies(loadInfo->GetSandboxFlags())) {
7735+
if (SandboxFlagsImplyCookies(mBrowsingContext->GetSandboxFlags())) {
77377736
loadFlags |= nsIRequest::LOAD_DOCUMENT_NEEDS_COOKIE;
77387737
}
77397738

@@ -8279,7 +8278,7 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState,
82798278
// should match this one when both are applicable.
82808279
nsCOMPtr<nsILoadInfo> secCheckLoadInfo = new LoadInfo(
82818280
mScriptGlobal, aLoadState->TriggeringPrincipal(), requestingContext,
8282-
nsILoadInfo::SEC_ONLY_FOR_EXPLICIT_CONTENTSEC_CHECK, 0);
8281+
nsILoadInfo::SEC_ONLY_FOR_EXPLICIT_CONTENTSEC_CHECK);
82838282

82848283
// Since Content Policy checks are performed within docShell as well as
82858284
// the ContentSecurityManager we need a reliable way to let certain
@@ -9827,6 +9826,8 @@ nsresult nsDocShell::DoURILoad(nsDocShellLoadState* aLoadState,
98279826
return NS_ERROR_FAILURE;
98289827
}
98299828

9829+
bool isSandBoxed = mBrowsingContext->GetSandboxFlags() & SANDBOXED_ORIGIN;
9830+
98309831
// We want to inherit aLoadState->PrincipalToInherit() when:
98319832
// 1. ChannelShouldInheritPrincipal returns true.
98329833
// 2. aLoadState->URI() is not data: URI, or data: URI is not
@@ -9848,7 +9849,6 @@ nsresult nsDocShell::DoURILoad(nsDocShellLoadState* aLoadState,
98489849
nsLoadFlags loadFlags = mDefaultLoadFlags;
98499850
nsSecurityFlags securityFlags =
98509851
nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL;
9851-
uint32_t sandboxFlags = mBrowsingContext->GetSandboxFlags();
98529852

98539853
if (aLoadState->FirstParty()) {
98549854
// tag first party URL loads
@@ -9864,16 +9864,16 @@ nsresult nsDocShell::DoURILoad(nsDocShellLoadState* aLoadState,
98649864
if (inheritPrincipal) {
98659865
securityFlags |= nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL;
98669866
}
9867+
if (isSandBoxed) {
9868+
securityFlags |= nsILoadInfo::SEC_SANDBOXED;
9869+
}
98679870

98689871
RefPtr<LoadInfo> loadInfo =
98699872
(contentPolicyType == nsIContentPolicy::TYPE_DOCUMENT)
98709873
? new LoadInfo(loadingWindow, aLoadState->TriggeringPrincipal(),
9871-
topLevelLoadingContext, securityFlags, sandboxFlags)
9874+
topLevelLoadingContext, securityFlags)
98729875
: new LoadInfo(loadingPrincipal, aLoadState->TriggeringPrincipal(),
9873-
loadingNode, securityFlags, contentPolicyType,
9874-
Maybe<mozilla::dom::ClientInfo>(),
9875-
Maybe<mozilla::dom::ServiceWorkerDescriptor>(),
9876-
sandboxFlags);
9876+
loadingNode, securityFlags, contentPolicyType);
98779877

98789878
if (aLoadState->PrincipalToInherit()) {
98799879
loadInfo->SetPrincipalToInherit(aLoadState->PrincipalToInherit());
@@ -9953,14 +9953,14 @@ nsresult nsDocShell::DoURILoad(nsDocShellLoadState* aLoadState,
99539953
// same process), which breaks if we serialize to the parent process.
99549954
bool canUseDocumentChannel =
99559955
aLoadState->HasLoadFlags(INTERNAL_LOAD_FLAGS_IS_SRCDOC)
9956-
? (sandboxFlags & SANDBOXED_ORIGIN)
9956+
? isSandBoxed
99579957
: SchemeUsesDocChannel(aLoadState->URI());
99589958

99599959
if (StaticPrefs::browser_tabs_documentchannel() && XRE_IsContentProcess() &&
99609960
canUseDocumentChannel) {
9961-
channel = new DocumentChannelChild(aLoadState, loadInfo, initiatorType,
9962-
loadFlags, mLoadType, cacheKey, isActive,
9963-
isTopLevelDoc, sandboxFlags);
9961+
channel = new DocumentChannelChild(
9962+
aLoadState, loadInfo, initiatorType, loadFlags, mLoadType, cacheKey,
9963+
isActive, isTopLevelDoc, mBrowsingContext->GetSandboxFlags());
99649964
channel->SetNotificationCallbacks(this);
99659965
} else if (!CreateAndConfigureRealChannelForLoadState(
99669966
aLoadState, loadInfo, this, this, initiatorType, loadFlags,

‎dom/base/Document.cpp

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2105,15 +2105,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(Document)
21052105
uint32_t nsid = tmp->GetDefaultNamespaceID();
21062106
nsAutoCString uri;
21072107
if (tmp->mDocumentURI) uri = tmp->mDocumentURI->GetSpecOrDefault();
2108-
static const char* kNSURIs[] = {"([none])", "(xmlns)", "(xml)",
2109-
"(xhtml)", "(XLink)", "(XSLT)",
2110-
"(MathML)", "(RDF)", "(XUL)"};
2111-
if (nsid < ArrayLength(kNSURIs)) {
2112-
SprintfLiteral(name, "Document %s %s %s", loadedAsData.get(),
2113-
kNSURIs[nsid], uri.get());
2114-
} else {
2115-
SprintfLiteral(name, "Document %s %s", loadedAsData.get(), uri.get());
2116-
}
2108+
const char* nsuri = nsNameSpaceManager::GetNameSpaceDisplayName(nsid);
2109+
SprintfLiteral(name, "Document %s %s %s", loadedAsData.get(), nsuri,
2110+
uri.get());
21172111
cb.DescribeRefCountedNode(tmp->mRefCnt.get(), name);
21182112
} else {
21192113
NS_IMPL_CYCLE_COLLECTION_DESCRIBE(Document, tmp->mRefCnt.get())
@@ -3128,10 +3122,10 @@ nsresult Document::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel,
31283122
// immutable after being set here.
31293123
nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(aContainer);
31303124

3131-
// If this is an error page, don't inherit sandbox flags
3125+
// If this is an error page, don't inherit sandbox flags from docshell
31323126
nsCOMPtr<nsILoadInfo> loadInfo = aChannel->LoadInfo();
31333127
if (docShell && !loadInfo->GetLoadErrorPage()) {
3134-
mSandboxFlags = loadInfo->GetSandboxFlags();
3128+
mSandboxFlags = docShell->GetBrowsingContext()->GetSandboxFlags();
31353129
WarnIfSandboxIneffective(docShell, mSandboxFlags, GetChannel());
31363130
}
31373131

‎dom/base/nsObjectLoadingContent.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2271,6 +2271,7 @@ nsresult nsObjectLoadingContent::OpenChannel() {
22712271
RefPtr<ObjectInterfaceRequestorShim> shim =
22722272
new ObjectInterfaceRequestorShim(this);
22732273

2274+
bool isSandBoxed = doc->GetSandboxFlags() & SANDBOXED_ORIGIN;
22742275
bool inherit = nsContentUtils::ChannelShouldInheritPrincipal(
22752276
thisContent->NodePrincipal(), mURI,
22762277
true, // aInheritForAboutBlank
@@ -2284,6 +2285,9 @@ nsresult nsObjectLoadingContent::OpenChannel() {
22842285
if (inherit && !isURIUniqueOrigin) {
22852286
securityFlags |= nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL;
22862287
}
2288+
if (isSandBoxed) {
2289+
securityFlags |= nsILoadInfo::SEC_SANDBOXED;
2290+
}
22872291

22882292
nsContentPolicyType contentPolicyType = GetContentPolicyType();
22892293

@@ -2294,9 +2298,7 @@ nsresult nsObjectLoadingContent::OpenChannel() {
22942298
shim, // aCallbacks
22952299
nsIChannel::LOAD_CALL_CONTENT_SNIFFERS |
22962300
nsIChannel::LOAD_BYPASS_SERVICE_WORKER |
2297-
nsIRequest::LOAD_HTML_OBJECT_DATA,
2298-
nullptr, // aIoService
2299-
doc->GetSandboxFlags());
2301+
nsIRequest::LOAD_HTML_OBJECT_DATA);
23002302
NS_ENSURE_SUCCESS(rv, rv);
23012303
if (inherit) {
23022304
nsCOMPtr<nsILoadInfo> loadinfo = chan->LoadInfo();

‎dom/security/nsContentSecurityManager.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,7 @@ static void LogSecurityFlags(nsSecurityFlags securityFlags) {
666666
{nsILoadInfo::SEC_COOKIES_SAME_ORIGIN, "SEC_COOKIES_SAME_ORIGIN"},
667667
{nsILoadInfo::SEC_COOKIES_OMIT, "SEC_COOKIES_OMIT"},
668668
{nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL, "SEC_FORCE_INHERIT_PRINCIPAL"},
669+
{nsILoadInfo::SEC_SANDBOXED, "SEC_SANDBOXED"},
669670
{nsILoadInfo::SEC_ABOUT_BLANK_INHERITS, "SEC_ABOUT_BLANK_INHERITS"},
670671
{nsILoadInfo::SEC_ALLOW_CHROME, "SEC_ALLOW_CHROME"},
671672
{nsILoadInfo::SEC_DISALLOW_SCRIPT, "SEC_DISALLOW_SCRIPT"},

‎dom/websocket/WebSocket.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1742,7 +1742,7 @@ nsresult WebSocketImpl::InitializeConnection(
17421742
rv = wsChannel->InitLoadInfoNative(
17431743
doc, doc ? doc->NodePrincipal() : aPrincipal, aPrincipal, aCookieSettings,
17441744
nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
1745-
nsIContentPolicy::TYPE_WEBSOCKET, 0);
1745+
nsIContentPolicy::TYPE_WEBSOCKET);
17461746
MOZ_ASSERT(NS_SUCCEEDED(rv));
17471747

17481748
if (!mRequestedProtocolList.IsEmpty()) {

‎dom/xhr/XMLHttpRequestMainThread.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
#include "nsIJARURI.h"
4444
#include "nsLayoutCID.h"
4545
#include "nsReadableUtils.h"
46-
#include "nsSandboxFlags.h"
4746

4847
#include "nsIURI.h"
4948
#include "nsIURIMutator.h"
@@ -2377,12 +2376,11 @@ nsresult XMLHttpRequestMainThread::CreateChannel() {
23772376

23782377
nsSecurityFlags secFlags;
23792378
nsLoadFlags loadFlags = nsIRequest::LOAD_BACKGROUND;
2380-
uint32_t sandboxFlags = 0;
23812379
if (mPrincipal->IsSystemPrincipal()) {
23822380
// When chrome is loading we want to make sure to sandbox any potential
23832381
// result document. We also want to allow cross-origin loads.
2384-
secFlags = nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL;
2385-
sandboxFlags = SANDBOXED_ORIGIN;
2382+
secFlags = nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL |
2383+
nsILoadInfo::SEC_SANDBOXED;
23862384
} else if (IsSystemXHR()) {
23872385
// For pages that have appropriate permissions, we want to still allow
23882386
// cross-origin loads, but make sure that the any potential result
@@ -2413,7 +2411,7 @@ nsresult XMLHttpRequestMainThread::CreateChannel() {
24132411
nullptr, // aPerformanceStorage
24142412
loadGroup,
24152413
nullptr, // aCallbacks
2416-
loadFlags, nullptr, sandboxFlags);
2414+
loadFlags);
24172415
} else if (mClientInfo.isSome()) {
24182416
rv = NS_NewChannel(getter_AddRefs(mChannel), mRequestURL, mPrincipal,
24192417
mClientInfo.ref(), mController, secFlags,
@@ -2422,7 +2420,7 @@ nsresult XMLHttpRequestMainThread::CreateChannel() {
24222420
mPerformanceStorage, // aPerformanceStorage
24232421
loadGroup,
24242422
nullptr, // aCallbacks
2425-
loadFlags, nullptr, sandboxFlags);
2423+
loadFlags);
24262424
} else {
24272425
// Otherwise use the principal.
24282426
rv = NS_NewChannel(getter_AddRefs(mChannel), mRequestURL, mPrincipal,
@@ -2431,7 +2429,7 @@ nsresult XMLHttpRequestMainThread::CreateChannel() {
24312429
mPerformanceStorage, // aPerformanceStorage
24322430
loadGroup,
24332431
nullptr, // aCallbacks
2434-
loadFlags, nullptr, sandboxFlags);
2432+
loadFlags);
24352433
}
24362434
NS_ENSURE_SUCCESS(rv, rv);
24372435

‎ipc/glue/BackgroundUtils.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -571,8 +571,7 @@ nsresult LoadInfoToLoadInfoArgs(nsILoadInfo* aLoadInfo,
571571
loadingPrincipalInfo, triggeringPrincipalInfo, principalToInheritInfo,
572572
sandboxedLoadingPrincipalInfo, topLevelPrincipalInfo,
573573
topLevelStorageAreaPrincipalInfo, optionalResultPrincipalURI,
574-
aLoadInfo->GetSecurityFlags(), aLoadInfo->GetSandboxFlags(),
575-
aLoadInfo->InternalContentPolicyType(),
574+
aLoadInfo->GetSecurityFlags(), aLoadInfo->InternalContentPolicyType(),
576575
static_cast<uint32_t>(aLoadInfo->GetTainting()),
577576
aLoadInfo->GetBlockAllMixedContent(),
578577
aLoadInfo->GetUpgradeInsecureRequests(),
@@ -761,7 +760,7 @@ nsresult LoadInfoArgsToLoadInfo(
761760
sandboxedLoadingPrincipal, topLevelPrincipal,
762761
topLevelStorageAreaPrincipal, resultPrincipalURI, cookieSettings,
763762
cspToInherit, clientInfo, reservedClientInfo, initialClientInfo,
764-
controller, loadInfoArgs.securityFlags(), loadInfoArgs.sandboxFlags(),
763+
controller, loadInfoArgs.securityFlags(),
765764
loadInfoArgs.contentPolicyType(),
766765
static_cast<LoadTainting>(loadInfoArgs.tainting()),
767766
loadInfoArgs.blockAllMixedContent(),

‎netwerk/base/LoadInfo.cpp

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ LoadInfo::LoadInfo(
5656
nsINode* aLoadingContext, nsSecurityFlags aSecurityFlags,
5757
nsContentPolicyType aContentPolicyType,
5858
const Maybe<mozilla::dom::ClientInfo>& aLoadingClientInfo,
59-
const Maybe<mozilla::dom::ServiceWorkerDescriptor>& aController,
60-
uint32_t aSandboxFlags)
59+
const Maybe<mozilla::dom::ServiceWorkerDescriptor>& aController)
6160
: mLoadingPrincipal(aLoadingContext ? aLoadingContext->NodePrincipal()
6261
: aLoadingPrincipal),
6362
mTriggeringPrincipal(aTriggeringPrincipal ? aTriggeringPrincipal
@@ -68,7 +67,6 @@ LoadInfo::LoadInfo(
6867
mLoadingContext(do_GetWeakReference(aLoadingContext)),
6968
mContextForTopLevelLoad(nullptr),
7069
mSecurityFlags(aSecurityFlags),
71-
mSandboxFlags(aSandboxFlags),
7270
mInternalContentPolicyType(aContentPolicyType),
7371
mTainting(LoadTainting::Basic),
7472
mBlockAllMixedContent(false),
@@ -136,7 +134,7 @@ LoadInfo::LoadInfo(
136134
aLoadingContext->NodePrincipal() == aLoadingPrincipal);
137135

138136
// if the load is sandboxed, we can not also inherit the principal
139-
if (mSandboxFlags & SANDBOXED_ORIGIN) {
137+
if (mSecurityFlags & nsILoadInfo::SEC_SANDBOXED) {
140138
mForceInheritPrincipalDropped =
141139
(mSecurityFlags & nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL);
142140
mSecurityFlags &= ~nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL;
@@ -324,13 +322,12 @@ LoadInfo::LoadInfo(
324322
LoadInfo::LoadInfo(nsPIDOMWindowOuter* aOuterWindow,
325323
nsIPrincipal* aTriggeringPrincipal,
326324
nsISupports* aContextForTopLevelLoad,
327-
nsSecurityFlags aSecurityFlags, uint32_t aSandboxFlags)
325+
nsSecurityFlags aSecurityFlags)
328326
: mLoadingPrincipal(nullptr),
329327
mTriggeringPrincipal(aTriggeringPrincipal),
330328
mPrincipalToInherit(nullptr),
331329
mContextForTopLevelLoad(do_GetWeakReference(aContextForTopLevelLoad)),
332330
mSecurityFlags(aSecurityFlags),
333-
mSandboxFlags(aSandboxFlags),
334331
mInternalContentPolicyType(nsIContentPolicy::TYPE_DOCUMENT),
335332
mTainting(LoadTainting::Basic),
336333
mBlockAllMixedContent(false),
@@ -370,7 +367,7 @@ LoadInfo::LoadInfo(nsPIDOMWindowOuter* aOuterWindow,
370367
MOZ_ASSERT(mTriggeringPrincipal);
371368

372369
// if the load is sandboxed, we can not also inherit the principal
373-
if (mSandboxFlags & SANDBOXED_ORIGIN) {
370+
if (mSecurityFlags & nsILoadInfo::SEC_SANDBOXED) {
374371
mForceInheritPrincipalDropped =
375372
(mSecurityFlags & nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL);
376373
mSecurityFlags &= ~nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL;
@@ -438,7 +435,6 @@ LoadInfo::LoadInfo(const LoadInfo& rhs)
438435
mLoadingContext(rhs.mLoadingContext),
439436
mContextForTopLevelLoad(rhs.mContextForTopLevelLoad),
440437
mSecurityFlags(rhs.mSecurityFlags),
441-
mSandboxFlags(rhs.mSandboxFlags),
442438
mInternalContentPolicyType(rhs.mInternalContentPolicyType),
443439
mTainting(rhs.mTainting),
444440
mBlockAllMixedContent(rhs.mBlockAllMixedContent),
@@ -495,10 +491,9 @@ LoadInfo::LoadInfo(
495491
const Maybe<ClientInfo>& aReservedClientInfo,
496492
const Maybe<ClientInfo>& aInitialClientInfo,
497493
const Maybe<ServiceWorkerDescriptor>& aController,
498-
nsSecurityFlags aSecurityFlags, uint32_t aSandboxFlags,
499-
nsContentPolicyType aContentPolicyType, LoadTainting aTainting,
500-
bool aBlockAllMixedContent, bool aUpgradeInsecureRequests,
501-
bool aBrowserUpgradeInsecureRequests,
494+
nsSecurityFlags aSecurityFlags, nsContentPolicyType aContentPolicyType,
495+
LoadTainting aTainting, bool aBlockAllMixedContent,
496+
bool aUpgradeInsecureRequests, bool aBrowserUpgradeInsecureRequests,
502497
bool aBrowserWouldUpgradeInsecureRequests, bool aForceAllowDataURI,
503498
bool aAllowInsecureRedirectToDataURI, bool aBypassCORSChecks,
504499
bool aSkipContentPolicyCheckForWebRequest,
@@ -533,7 +528,6 @@ LoadInfo::LoadInfo(
533528
mController(aController),
534529
mLoadingContext(do_GetWeakReference(aLoadingContext)),
535530
mSecurityFlags(aSecurityFlags),
536-
mSandboxFlags(aSandboxFlags),
537531
mInternalContentPolicyType(aContentPolicyType),
538532
mTainting(aTainting),
539533
mBlockAllMixedContent(aBlockAllMixedContent),
@@ -672,7 +666,7 @@ nsIPrincipal* LoadInfo::FindPrincipalToInherit(nsIChannel* aChannel) {
672666
}
673667

674668
nsIPrincipal* LoadInfo::GetSandboxedLoadingPrincipal() {
675-
if (!(mSandboxFlags & SANDBOXED_ORIGIN)) {
669+
if (!(mSecurityFlags & nsILoadInfo::SEC_SANDBOXED)) {
676670
return nullptr;
677671
}
678672

@@ -742,12 +736,6 @@ LoadInfo::GetSecurityFlags(nsSecurityFlags* aResult) {
742736
return NS_OK;
743737
}
744738

745-
NS_IMETHODIMP
746-
LoadInfo::GetSandboxFlags(uint32_t* aResult) {
747-
*aResult = mSandboxFlags;
748-
return NS_OK;
749-
}
750-
751739
NS_IMETHODIMP
752740
LoadInfo::GetSecurityMode(uint32_t* aFlags) {
753741
*aFlags =
@@ -846,7 +834,7 @@ LoadInfo::GetForceInheritPrincipalOverruleOwner(bool* aInheritPrincipal) {
846834

847835
NS_IMETHODIMP
848836
LoadInfo::GetLoadingSandboxed(bool* aLoadingSandboxed) {
849-
*aLoadingSandboxed = (mSandboxFlags & SANDBOXED_ORIGIN);
837+
*aLoadingSandboxed = (mSecurityFlags & nsILoadInfo::SEC_SANDBOXED);
850838
return NS_OK;
851839
}
852840

‎netwerk/base/LoadInfo.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,14 @@ class LoadInfo final : public nsILoadInfo {
6363
const Maybe<mozilla::dom::ClientInfo>& aLoadingClientInfo =
6464
Maybe<mozilla::dom::ClientInfo>(),
6565
const Maybe<mozilla::dom::ServiceWorkerDescriptor>& aController =
66-
Maybe<mozilla::dom::ServiceWorkerDescriptor>(),
67-
uint32_t aSandboxFlags = 0);
66+
Maybe<mozilla::dom::ServiceWorkerDescriptor>());
6867

6968
// Constructor used for TYPE_DOCUMENT loads which have a different
7069
// loadingContext than other loads. This ContextForTopLevelLoad is
7170
// only used for content policy checks.
7271
LoadInfo(nsPIDOMWindowOuter* aOuterWindow, nsIPrincipal* aTriggeringPrincipal,
73-
nsISupports* aContextForTopLevelLoad, nsSecurityFlags aSecurityFlags,
74-
uint32_t aSandboxFlags);
72+
nsISupports* aContextForTopLevelLoad,
73+
nsSecurityFlags aSecurityFlags);
7574

7675
// create an exact copy of the loadinfo
7776
already_AddRefed<nsILoadInfo> Clone() const;
@@ -134,7 +133,7 @@ class LoadInfo final : public nsILoadInfo {
134133
const Maybe<mozilla::dom::ClientInfo>& aReservedClientInfo,
135134
const Maybe<mozilla::dom::ClientInfo>& aInitialClientInfo,
136135
const Maybe<mozilla::dom::ServiceWorkerDescriptor>& aController,
137-
nsSecurityFlags aSecurityFlags, uint32_t aSandboxFlags,
136+
nsSecurityFlags aSecurityFlags,
138137
nsContentPolicyType aContentPolicyType, LoadTainting aTainting,
139138
bool aBlockAllMixedContent, bool aUpgradeInsecureRequests,
140139
bool aBrowserUpgradeInsecureRequests,
@@ -214,7 +213,6 @@ class LoadInfo final : public nsILoadInfo {
214213
nsWeakPtr mLoadingContext;
215214
nsWeakPtr mContextForTopLevelLoad;
216215
nsSecurityFlags mSecurityFlags;
217-
uint32_t mSandboxFlags;
218216
nsContentPolicyType mInternalContentPolicyType;
219217
LoadTainting mTainting;
220218
bool mBlockAllMixedContent;

‎netwerk/base/nsIIOService.idl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ interface nsIIOService : nsISupports
117117
in const_MaybeServiceWorkerDescriptorRef aController,
118118
in unsigned long aSecurityFlags,
119119
in unsigned long aContentPolicyType,
120-
in unsigned long aSandboxFlags,
121120
out nsIChannel aResult);
122121

123122
/**

0 commit comments

Comments
 (0)