Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(852)

Unified Diff: Source/core/frame/csp/ContentSecurityPolicy.cpp

Issue 980213002: Rename InsecureContentPolicy to InsecureRequestsPolicy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/csp/ContentSecurityPolicy.h ('k') | Source/core/frame/csp/ContentSecurityPolicyTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/csp/ContentSecurityPolicy.cpp
diff --git a/Source/core/frame/csp/ContentSecurityPolicy.cpp b/Source/core/frame/csp/ContentSecurityPolicy.cpp
index 5736653b52e36159ac34a58c68a38b6fec377d2f..acf852427b319190516be019a0bea00ca2a77e89 100644
--- a/Source/core/frame/csp/ContentSecurityPolicy.cpp
+++ b/Source/core/frame/csp/ContentSecurityPolicy.cpp
@@ -148,7 +148,7 @@ ContentSecurityPolicy::ContentSecurityPolicy()
, m_sandboxMask(0)
, m_enforceStrictMixedContentChecking(false)
, m_referrerPolicy(ReferrerPolicyDefault)
- , m_insecureContentPolicy(SecurityContext::InsecureContentDoNotUpgrade)
+ , m_insecureRequestsPolicy(SecurityContext::InsecureRequestsDoNotUpgrade)
{
}
@@ -176,8 +176,8 @@ void ContentSecurityPolicy::applyPolicySideEffectsToExecutionContext()
document->enforceStrictMixedContentChecking();
if (didSetReferrerPolicy())
document->setReferrerPolicy(m_referrerPolicy);
- if (m_insecureContentPolicy > document->insecureContentPolicy())
- document->setInsecureContentPolicy(m_insecureContentPolicy);
+ if (m_insecureRequestsPolicy > document->insecureRequestsPolicy())
+ document->setInsecureRequestsPolicy(m_insecureRequestsPolicy);
for (const auto& consoleMessage : m_consoleMessages)
m_executionContext->addConsoleMessage(consoleMessage);
@@ -632,10 +632,10 @@ void ContentSecurityPolicy::enforceStrictMixedContentChecking()
m_enforceStrictMixedContentChecking = true;
}
-void ContentSecurityPolicy::setInsecureContentPolicy(SecurityContext::InsecureContentPolicy policy)
+void ContentSecurityPolicy::setInsecureRequestsPolicy(SecurityContext::InsecureRequestsPolicy policy)
{
- if (policy > m_insecureContentPolicy)
- m_insecureContentPolicy = policy;
+ if (policy > m_insecureRequestsPolicy)
+ m_insecureRequestsPolicy = policy;
}
static String stripURLForUseInReport(Document* document, const KURL& url)
« no previous file with comments | « Source/core/frame/csp/ContentSecurityPolicy.h ('k') | Source/core/frame/csp/ContentSecurityPolicyTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698