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

Unified Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2040133003: Replace SecurityContext::InsecureRequestsPolicy with WebInsecureRequestPolicy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@combine-uir-block
Patch Set: 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/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 2b94715d0ecbb29575518815d8c9543d0edae911..fb92bbc05f3dd15b9e4881f46bb78610116d8f2a 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -1572,28 +1572,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

Powered by Google App Engine
This is Rietveld 408576698