third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 1489253002: Plumb document's strict mixed content checking for RemoteFrames

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1489253002: Plumb document's strict mixed content checking for RemoteFrames (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix transition type for test crashes Created 5 years 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

« content/browser/frame_host/render_frame_host_manager_unittest.cc ('K') | « third_party/WebKit/Source/core/dom/SecurityContext.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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