| 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 ba674ec4bd2262389974d23aa6a7575b8c16a65b..544b1768c1bb887a25127127e45d2851d427ca25 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| @@ -1517,13 +1517,7 @@ bool FrameLoader::shouldEnforceStrictMixedContentChecking() const
|
| if (!parentFrame)
|
| return false;
|
|
|
| - // FIXME: We need a way to propagate strict mixed content checking flags to
|
| - // out-of-process frames. For now, we'll always enforce.
|
| - if (!parentFrame->isLocalFrame())
|
| - return true;
|
| -
|
| - ASSERT(toLocalFrame(parentFrame)->document());
|
| - return toLocalFrame(parentFrame)->document()->shouldEnforceStrictMixedContentChecking();
|
| + return parentFrame->securityContext()->shouldEnforceStrictMixedContentChecking();
|
| }
|
|
|
| SecurityContext::InsecureRequestsPolicy FrameLoader::insecureRequestsPolicy() const
|
|
|