| Index: third_party/WebKit/Source/core/dom/Document.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
|
| index f9c5602a6102cf49caa7c325114d588192cee7eb..5db3b7a190fd4e640678046b18c614893985bc48 100644
|
| --- a/third_party/WebKit/Source/core/dom/Document.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/Document.cpp
|
| @@ -4902,9 +4902,7 @@ void Document::initSecurityContext(const DocumentInit& initializer)
|
| // In the common case, create the security context from the currently
|
| // loading URL with a fresh content security policy.
|
| enforceSandboxFlags(initializer.getSandboxFlags());
|
| - if (initializer.shouldEnforceStrictMixedContentChecking())
|
| - enforceStrictMixedContentChecking();
|
| - setInsecureRequestsPolicy(initializer.getInsecureRequestsPolicy());
|
| + enforceInsecureRequestPolicy(initializer.getInsecureRequestPolicy());
|
| if (initializer.insecureNavigationsToUpgrade()) {
|
| for (auto toUpgrade : *initializer.insecureNavigationsToUpgrade())
|
| addInsecureNavigationUpgrade(toUpgrade);
|
| @@ -5860,10 +5858,10 @@ WebTaskRunner* Document::timerTaskRunner() const
|
| return Platform::current()->currentThread()->scheduler()->timerTaskRunner();
|
| }
|
|
|
| -void Document::enforceStrictMixedContentChecking()
|
| +void Document::enforceInsecureRequestPolicy(WebInsecureRequestPolicy policy)
|
| {
|
| - securityContext().setShouldEnforceStrictMixedContentChecking(true);
|
| - if (frame())
|
| + securityContext().setInsecureRequestPolicy(policy);
|
| + if (frame() && policy & kBlockAllMixedContent)
|
| frame()->loader().client()->didEnforceStrictMixedContentChecking();
|
| }
|
|
|
|
|