Index: content/browser/frame_host/render_frame_host_impl.cc |
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc |
index f284e5765ae46ad8fe3d6ec78e6a8c38ec56c3af..b0eda72a93eceee6d3b841ae93816c5c55712745 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.cc |
+++ b/content/browser/frame_host/render_frame_host_impl.cc |
@@ -517,6 +517,15 @@ bool RenderFrameHostImpl::CreateRenderFrame(int parent_routing_id, |
Send(new FrameMsg_NewFrame(routing_id_, parent_routing_id, proxy_routing_id, |
frame_tree_node()->current_replication_state())); |
+ if (proxy_routing_id != MSG_ROUTING_NONE) { |
+ RenderFrameProxyHost* proxy = RenderFrameProxyHost::FromID( |
+ GetProcess()->GetID(), proxy_routing_id); |
+ DCHECK(proxy); |
nasko
2015/01/20 23:51:23
nit: no need for this DCHECK, it will crash on the
lazyboy
2015/01/21 18:52:14
Done.
|
+ // We have also created a RenderFrameProxy in FrameMsg_NewFrame above, so |
+ // remember that. |
+ proxy->set_render_frame_proxy_created(true); |
+ } |
+ |
// The renderer now has a RenderFrame for this RenderFrameHost. Note that |
// this path is only used for out-of-process iframes. Main frame RenderFrames |
// are created with their RenderView, and same-site iframes are created at the |