| Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| index 5a8d92f106b38af140fcd2e80fac059e87d89e4b..6d44fd123dcaafa0375566d6c6e6bafc17fdccfa 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| @@ -1571,28 +1571,13 @@ SandboxFlags FrameLoader::effectiveSandboxFlags() const
|
| return flags;
|
| }
|
|
|
| -bool FrameLoader::shouldEnforceStrictMixedContentChecking() const
|
| +WebInsecureRequestPolicy FrameLoader::getInsecureRequestPolicy() const
|
| {
|
| Frame* parentFrame = m_frame->tree().parent();
|
| if (!parentFrame)
|
| - return false;
|
| -
|
| - return parentFrame->securityContext()->shouldEnforceStrictMixedContentChecking();
|
| -}
|
| -
|
| -SecurityContext::InsecureRequestsPolicy FrameLoader::getInsecureRequestsPolicy() const
|
| -{
|
| - Frame* parentFrame = m_frame->tree().parent();
|
| - if (!parentFrame)
|
| - return SecurityContext::InsecureRequestsDoNotUpgrade;
|
| -
|
| - // FIXME: We need a way to propagate insecure requests policy flags to
|
| - // out-of-process frames. For now, we'll always use default behavior.
|
| - if (!parentFrame->isLocalFrame())
|
| - return SecurityContext::InsecureRequestsDoNotUpgrade;
|
| + return kLeaveInsecureRequestsAlone;
|
|
|
| - ASSERT(toLocalFrame(parentFrame)->document());
|
| - return toLocalFrame(parentFrame)->document()->getInsecureRequestsPolicy();
|
| + return parentFrame->securityContext()->getInsecureRequestPolicy();
|
| }
|
|
|
| SecurityContext::InsecureNavigationsSet* FrameLoader::insecureNavigationsToUpgrade() const
|
|
|