OOPIF: Handle cross-site frames being blocked by X-Frame-Options or CSP.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 689e5bea02ec7a1705fec1795361118b3877ca9f..fad607b21df14f6077918fafbec20f1e09bbc6c6 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1427,6 +1427,8 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags)
     IPC_MESSAGE_HANDLER(FrameMsg_SetFrameOwnerProperties,
                         OnSetFrameOwnerProperties)
+    IPC_MESSAGE_HANDLER(FrameMsg_CancelLoadAfterXFrameOptionsOrCSPDenied,
+                        OnCancelLoadAfterXFrameOptionsOrCSPDenied)
     IPC_MESSAGE_HANDLER(FrameMsg_AdvanceFocus, OnAdvanceFocus)
     IPC_MESSAGE_HANDLER(FrameMsg_SetFocusedFrame, OnSetFocusedFrame)
     IPC_MESSAGE_HANDLER(FrameMsg_SetTextTrackSettings,
@@ -2044,6 +2046,10 @@ void RenderFrameImpl::OnSetFrameOwnerProperties(
   frame_->setFrameOwnerProperties(frame_owner_properties);
 }
 
+void RenderFrameImpl::OnCancelLoadAfterXFrameOptionsOrCSPDenied() {
+  frame_->cancelLoadAfterXFrameOptionsOrCSPDenied();
+}
+
 void RenderFrameImpl::OnAdvanceFocus(blink::WebFocusType type,
                                      int32_t source_routing_id) {
   RenderFrameProxy* source_frame =
@@ -2788,6 +2794,11 @@ void RenderFrameImpl::didChangeFrameOwnerProperties(
            frame_owner_properties));
 }
 
+void RenderFrameImpl::didCancelLoadAfterXFrameOptionsOrCSPDenied() {
+  Send(
+      new FrameHostMsg_DidCancelLoadAfterXFrameOptionsOrCSPDenied(routing_id_));
+}
+
 void RenderFrameImpl::didMatchCSS(
     blink::WebLocalFrame* frame,
     const blink::WebVector<blink::WebString>& newly_matching_selectors,