| Index: Source/core/frame/csp/ContentSecurityPolicy.cpp
|
| diff --git a/Source/core/frame/csp/ContentSecurityPolicy.cpp b/Source/core/frame/csp/ContentSecurityPolicy.cpp
|
| index 3eb3d0fa975b72f7e99e9800d84a0536cf056478..4da13458db2d51a6ab79e79b616978d44901f2ee 100644
|
| --- a/Source/core/frame/csp/ContentSecurityPolicy.cpp
|
| +++ b/Source/core/frame/csp/ContentSecurityPolicy.cpp
|
| @@ -168,7 +168,10 @@ void ContentSecurityPolicy::applyPolicySideEffectsToExecutionContext()
|
| m_selfProtocol = securityOrigin()->protocol();
|
| m_selfSource = adoptPtr(new CSPSource(this, m_selfProtocol, securityOrigin()->host(), securityOrigin()->port(), String(), CSPSource::NoWildcard, CSPSource::NoWildcard));
|
|
|
| - // If we're in a Document, set the referrer policy, mixed content checking, and sandbox
|
| + if (didSetReferrerPolicy())
|
| + m_executionContext->setReferrerPolicy(m_referrerPolicy);
|
| +
|
| + // If we're in a Document, set mixed content checking and sandbox
|
| // flags, then dump all the parsing error messages, then poke at histograms.
|
| if (Document* document = this->document()) {
|
| if (m_sandboxMask != SandboxNone) {
|
| @@ -177,8 +180,6 @@ void ContentSecurityPolicy::applyPolicySideEffectsToExecutionContext()
|
| }
|
| if (m_enforceStrictMixedContentChecking)
|
| document->enforceStrictMixedContentChecking();
|
| - if (didSetReferrerPolicy())
|
| - document->setReferrerPolicy(m_referrerPolicy);
|
| if (m_insecureRequestsPolicy == SecurityContext::InsecureRequestsUpgrade) {
|
| UseCounter::count(document, UseCounter::UpgradeInsecureRequestsEnabled);
|
| document->setInsecureRequestsPolicy(m_insecureRequestsPolicy);
|
|
|