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

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

Issue 2040133003: Replace SecurityContext::InsecureRequestsPolicy with WebInsecureRequestPolicy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@combine-uir-block
Patch Set: Ugh. Created 4 years, 6 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
Index: third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
index f705ae0df639d93da35eaaf687017811685eb621..3f0944bfd518d812cbb647b17197fdace7db1d23 100644
--- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
+++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
@@ -185,14 +185,13 @@ void ContentSecurityPolicy::applyPolicySideEffectsToExecutionContext()
}
if (m_treatAsPublicAddress)
document->setAddressSpace(WebAddressSpacePublic);
+
+ document->enforceInsecureRequestPolicy(m_insecureRequestPolicy);
if (m_insecureRequestPolicy & kUpgradeInsecureRequests) {
UseCounter::count(document, UseCounter::UpgradeInsecureRequestsEnabled);
- document->setInsecureRequestsPolicy(SecurityContext::InsecureRequestsUpgrade);
if (!securityOrigin->host().isNull())
document->addInsecureNavigationUpgrade(securityOrigin->host().impl()->hash());
}
- if (m_insecureRequestPolicy & kBlockAllMixedContent)
- document->enforceStrictMixedContentChecking();
for (const auto& consoleMessage : m_consoleMessages)
m_executionContext->addConsoleMessage(consoleMessage);

Powered by Google App Engine
This is Rietveld 408576698