Index: content/browser/frame_host/render_frame_proxy_host.cc |
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc |
index fe62776995198a81592cc5447b7a85eb01f11c0c..8438b64d7e5c4b3889af9144677b8122b8569c5f 100644 |
--- a/content/browser/frame_host/render_frame_proxy_host.cc |
+++ b/content/browser/frame_host/render_frame_proxy_host.cc |
@@ -56,11 +56,14 @@ RenderFrameProxyHost::RenderFrameProxyHost(SiteInstance* site_instance, |
RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_), |
this)).second); |
- if (!frame_tree_node_->IsMainFrame() && |
- frame_tree_node_->parent() |
- ->render_manager() |
- ->current_frame_host() |
- ->GetSiteInstance() == site_instance) { |
+ if ((!frame_tree_node_->IsMainFrame() && |
+ frame_tree_node_->parent() |
+ ->render_manager() |
+ ->current_frame_host() |
+ ->GetSiteInstance() == site_instance) || |
+ // If this is a proxy for the guest FTN in its embedder process, then we |
+ // need a CrossProcessFrameConnector. |
+ frame_tree_node_->render_manager()->IsGuest()) { |
// The RenderFrameHost navigating cross-process is destroyed and a proxy for |
// it is created in the parent's process. CrossProcessFrameConnector |
// initialization only needs to happen on an initial cross-process |
@@ -92,9 +95,19 @@ void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) { |
static_cast<RenderWidgetHostViewChildFrame*>(view)); |
} |
+// TODO(lazyboy): We can probably cache a pointer to RVH in this class |
+// as we do in RenderFrameHostImpl. |
RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() { |
- return frame_tree_node_->frame_tree()->GetRenderViewHost( |
- site_instance_.get()); |
+ // RVH of embedder site instance does not live in the guest RFHM, we need |
nasko
2015/05/05 21:34:50
nit: s/site instance/SiteInstance/
lazyboy
2015/05/05 22:33:53
Done.
|
+ // to look it up in the embedder's FrameTree. |
+ RenderFrameProxyHost* proxy_to_embedder = |
+ frame_tree_node_->render_manager()->GetProxyToEmbedder(); |
+ FrameTree* frame_tree = |
+ proxy_to_embedder && |
+ proxy_to_embedder->GetSiteInstance() == GetSiteInstance() |
+ ? proxy_to_embedder->frame_tree_node_->frame_tree() |
+ : frame_tree_node_->frame_tree(); |
+ return frame_tree->GetRenderViewHost(site_instance_.get()); |
} |
void RenderFrameProxyHost::TakeFrameHostOwnership( |