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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1710283003: OOPIF: Handle cross-site frames being blocked by X-Frame-Options or CSP. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split off the relaxed DCHECK in OnCrossSiteResponse into separate CL Created 4 years, 10 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/test/data/frame-ancestors-none.html » ('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 482aa4929ae42835b2da7777c36de1672b72ba99..d62796d6c6015ce174e9befefae75a1baa636cf5 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1425,6 +1425,7 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags)
IPC_MESSAGE_HANDLER(FrameMsg_SetFrameOwnerProperties,
OnSetFrameOwnerProperties)
+ IPC_MESSAGE_HANDLER(FrameMsg_BlockedLoad, OnBlockedLoad)
IPC_MESSAGE_HANDLER(FrameMsg_AdvanceFocus, OnAdvanceFocus)
IPC_MESSAGE_HANDLER(FrameMsg_SetFocusedFrame, OnSetFocusedFrame)
IPC_MESSAGE_HANDLER(FrameMsg_SetTextTrackSettings,
@@ -2042,6 +2043,10 @@ void RenderFrameImpl::OnSetFrameOwnerProperties(
frame_->setFrameOwnerProperties(frame_owner_properties);
}
+void RenderFrameImpl::OnBlockedLoad() {
+ frame_->updateForBlockedLoad();
+}
+
void RenderFrameImpl::OnAdvanceFocus(blink::WebFocusType type,
int32_t source_routing_id) {
RenderFrameProxy* source_frame =
@@ -2786,6 +2791,10 @@ void RenderFrameImpl::didChangeFrameOwnerProperties(
frame_owner_properties));
}
+void RenderFrameImpl::didBlockLoad() {
+ Send(new FrameHostMsg_BlockedLoad(routing_id_));
+}
+
void RenderFrameImpl::didMatchCSS(
blink::WebLocalFrame* frame,
const blink::WebVector<blink::WebString>& newly_matching_selectors,
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/test/data/frame-ancestors-none.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698