Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-05 05:30:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1683464 - Remove aMimeTypeGuess from nsIContentSecurityPolicy::ShouldLoad. r=ckerschb

Browse Source 
This parameter is unused.

Depends on D100178

Differential Revision: https://phabricator.services.mozilla.com/D100179
This commit is contained in:
Masatoshi Kimura 2021-01-04 17:05:01 +00:00
parent 60442b1dea
commit 44274c030b
4 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/interfaces/security/nsIContentSecurityPolicy.idl
View File

@ -329,7 +329,6 @@ interface nsIContentSecurityPolicy : nsISerializable
short shouldLoad(in nsContentPolicyType aContentType,
in nsICSPEventListener aCSPEventListener,
in nsIURI aContentLocation,
in ACString aMimeTypeGuess,
in nsIURI aOriginalURIIfRedirect,
in bool aSendViolationReports,
in AString aNonce,

1
dom/security/nsCSPContext.cpp
View File

@ -118,7 +118,6 @@ NS_IMETHODIMP
nsCSPContext::ShouldLoad(nsContentPolicyType aContentType,
nsICSPEventListener* aCSPEventListener,
nsIURI* aContentLocation,
const nsACString& aMimeTypeGuess,
nsIURI* aOriginalURIIfRedirect,
bool aSendViolationReports, const nsAString& aNonce,
bool aParserCreated, int16_t* outDecision) {

5
dom/security/nsCSPService.cpp
View File

@ -151,7 +151,7 @@ bool subjectToCSP(nsIURI* aURI, nsContentPolicyType aContentType) {
if (preloadCsp) {
// obtain the enforcement decision
rv = preloadCsp->ShouldLoad(
contentType, cspEventListener, aContentLocation, aMimeTypeGuess,
contentType, cspEventListener, aContentLocation,
nullptr, // no redirect, aOriginal URL is null.
aLoadInfo->GetSendCSPViolationEvents(), cspNonce, parserCreatedScript,
aDecision);
@ -177,7 +177,6 @@ bool subjectToCSP(nsIURI* aURI, nsContentPolicyType aContentType) {
if (csp) {
// obtain the enforcement decision
rv = csp->ShouldLoad(contentType, cspEventListener, aContentLocation,
aMimeTypeGuess,
nullptr, // no redirect, aOriginal URL is null.
aLoadInfo->GetSendCSPViolationEvents(), cspNonce,
parserCreatedScript, aDecision);
@ -361,7 +360,6 @@ nsresult CSPService::ConsultCSPForRedirect(nsIURI* aOriginalURI,
policyType, // load type per nsIContentPolicy (uint32_t)
cspEventListener,
aNewURI, // nsIURI
""_ns, // ACString - MIME guess
aOriginalURI, // Original nsIURI
true, // aSendViolationReports
cspNonce, // nonce
@ -383,7 +381,6 @@ nsresult CSPService::ConsultCSPForRedirect(nsIURI* aOriginalURI,
csp->ShouldLoad(policyType, // load type per nsIContentPolicy (uint32_t)
cspEventListener,
aNewURI, // nsIURI
""_ns, // ACString - MIME guess
aOriginalURI, // Original nsIURI
true, // aSendViolationReports
cspNonce, // nonce

5
dom/security/test/unit/test_csp_reports.js
View File

@ -182,7 +182,6 @@ function run_test() {
null, // nsICSPEventListener
NetUtil.newURI("http://blocked.test/foo.js"),
null,
null,
true,
null,
false
@ -243,7 +242,6 @@ function run_test() {
null, // nsICSPEventListener
NetUtil.newURI("data:image/png;base64," + base64data),
null,
null,
true,
null,
false
@ -258,7 +256,6 @@ function run_test() {
null, // nsICSPEventListener
NetUtil.newURI("intent://mymaps.com/maps?um=1&ie=UTF-8&fb=1&sll"),
null,
null,
true,
null,
false
@ -275,7 +272,6 @@ function run_test() {
null, // nsICSPEventListener
NetUtil.newURI(selfSpec + "#bar"),
null,
null,
true,
null,
false
@ -294,7 +290,6 @@ function run_test() {
null, // nsICSPEventListener
NetUtil.newURI("ftp://blocked.test/profile.png"),
null,
null,
true,
null,
false