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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1489253002: Plumb document's strict mixed content checking for RemoteFrames (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nasko comments 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_frame_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 17d8764e90f8b8d4f2b6049c8fbf9f7f0328b205..d200e46df6b2b3dfcf645536ccf616ee830587a1 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2513,6 +2513,10 @@ void RenderFrameImpl::didChangeName(blink::WebLocalFrame* frame,
}
}
+void RenderFrameImpl::didEnforceStrictMixedContentChecking() {
+ Send(new FrameHostMsg_EnforceStrictMixedContentChecking(routing_id_));
+}
+
void RenderFrameImpl::didChangeSandboxFlags(blink::WebFrame* child_frame,
blink::WebSandboxFlags flags) {
Send(new FrameHostMsg_DidChangeSandboxFlags(
@@ -4166,10 +4170,6 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(
params.was_within_same_page = navigation_state->WasWithinSamePage();
params.security_info = response.securityInfo();
- // Set the URL to be displayed in the browser UI to the user.
- params.url = GetLoadingUrl();
- DCHECK(!is_swapped_out_ || params.url == GURL(kSwappedOutURL));
-
// Set the origin of the frame. This will be replicated to the corresponding
// RenderFrameProxies in other processes.
// TODO(alexmos): Origins for URLs with non-standard schemes are excluded due
@@ -4182,6 +4182,13 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(
}
}
+ params.should_enforce_strict_mixed_content_checking =
+ frame->shouldEnforceStrictMixedContentChecking();
+
+ // Set the URL to be displayed in the browser UI to the user.
+ params.url = GetLoadingUrl();
+ DCHECK(!is_swapped_out_ || params.url == GURL(kSwappedOutURL));
+
if (frame->document().baseURL() != params.url)
params.base_url = frame->document().baseURL();
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_frame_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698