Commit deb60c00 authored by nasko's avatar nasko Committed by Commit bot

Don't try to use RFH from proxies for subframes.

BUG=399775

Review URL: https://codereview.chromium.org/519203002

Cr-Commit-Position: refs/heads/master@{#292755}
parent 3467f088
...@@ -1067,7 +1067,7 @@ int RenderFrameHostManager::CreateRenderFrame(SiteInstance* instance, ...@@ -1067,7 +1067,7 @@ int RenderFrameHostManager::CreateRenderFrame(SiteInstance* instance,
// remove it from the list of proxy hosts below if it will be active. // remove it from the list of proxy hosts below if it will be active.
RenderFrameProxyHost* proxy = GetRenderFrameProxyHost(instance); RenderFrameProxyHost* proxy = GetRenderFrameProxyHost(instance);
if (proxy) { if (proxy && proxy->render_frame_host()) {
routing_id = proxy->GetRenderViewHost()->GetRoutingID(); routing_id = proxy->GetRenderViewHost()->GetRoutingID();
// Delete the existing RenderFrameProxyHost, but reuse the RenderFrameHost. // Delete the existing RenderFrameProxyHost, but reuse the RenderFrameHost.
// Prevent the process from exiting while we're trying to use it. // Prevent the process from exiting while we're trying to use it.
...@@ -1108,8 +1108,9 @@ int RenderFrameHostManager::CreateRenderFrame(SiteInstance* instance, ...@@ -1108,8 +1108,9 @@ int RenderFrameHostManager::CreateRenderFrame(SiteInstance* instance,
proxy = new RenderFrameProxyHost( proxy = new RenderFrameProxyHost(
new_render_frame_host->GetSiteInstance(), frame_tree_node_); new_render_frame_host->GetSiteInstance(), frame_tree_node_);
proxy_hosts_[instance->GetId()] = proxy; proxy_hosts_[instance->GetId()] = proxy;
proxy->TakeFrameHostOwnership(new_render_frame_host.Pass());
proxy_routing_id = proxy->GetRoutingID(); proxy_routing_id = proxy->GetRoutingID();
if (frame_tree_node_->IsMainFrame())
proxy->TakeFrameHostOwnership(new_render_frame_host.Pass());
} }
bool success = InitRenderView(render_view_host, bool success = InitRenderView(render_view_host,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment