Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 48df2c47c64f2d302060d6147a322e480872294d..b1afdb83f19a85450104b856ea7ca3ee872478ab 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -731,7 +731,11 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params, |
ApplyWebPreferences(webkit_preferences_, webview()); |
RenderFrameProxy* proxy = NULL; |
- if (params.proxy_routing_id != MSG_ROUTING_NONE) { |
+ // Do not create a proxy here if this is a swapped out RenderView for an |
+ // inner WebContents. |
+ // The proxy will be created in RenderFrameImpl::OnSwapOut(). |
nasko
2015/05/22 16:32:28
Is it not possible to just pass MSG_ROUTING_NONE f
lazyboy
2015/05/26 16:32:55
Yes, done.
|
+ if (params.proxy_routing_id != MSG_ROUTING_NONE && |
+ !params.is_inner_web_contents_in_site_per_process) { |
CHECK(params.swapped_out); |
proxy = RenderFrameProxy::CreateProxyToReplaceFrame( |
main_render_frame_, params.proxy_routing_id); |