Index: content/browser/frame_host/render_frame_host_manager.cc |
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc |
index 46428b9297b4bc75025545a1ffa1fc1a927c7161..38332018a4e6fdf64e44299686b6afa8b3c914b4 100644 |
--- a/content/browser/frame_host/render_frame_host_manager.cc |
+++ b/content/browser/frame_host/render_frame_host_manager.cc |
@@ -160,6 +160,22 @@ RenderFrameProxyHost* RenderFrameHostManager::GetProxyToParent() { |
return iter->second; |
} |
+RenderFrameProxyHost* RenderFrameHostManager::GetProxyToEmbedder() { |
+ int64 embedder_frame_tree_node_id = delegate_->GetEmbedderFrameTreeNodeID(); |
Charlie Reis
2015/05/19 07:12:31
nit: We've recently changed FTN IDs to be ints rat
lazyboy
2015/05/21 23:23:46
Done.
|
+ FrameTreeNode* embedder_frame_tree_node = |
+ FrameTreeNode::GloballyFindByID(embedder_frame_tree_node_id); |
+ if (!embedder_frame_tree_node) |
+ return nullptr; |
+ |
+ return GetRenderFrameProxyHost( |
+ embedder_frame_tree_node->current_frame_host()->GetSiteInstance()); |
+} |
+ |
+bool RenderFrameHostManager::IsGuest() { |
+ return frame_tree_node_->IsMainFrame() && |
Charlie Reis
2015/05/19 07:12:31
Why is this line needed? Is it important not to t
lazyboy
2015/05/21 23:23:46
I haven't started running subframes inside guest y
|
+ delegate_->GetEmbedderFrameTreeNodeID() != -1; |
+} |
+ |
void RenderFrameHostManager::SetPendingWebUI(const GURL& url, int bindings) { |
pending_web_ui_ = CreateWebUI(url, bindings); |
pending_and_current_web_ui_.reset(); |
@@ -460,6 +476,14 @@ void RenderFrameHostManager::DidNavigateFrame( |
void RenderFrameHostManager::CommitPendingIfNecessary( |
RenderFrameHostImpl* render_frame_host, |
bool was_caused_by_user_gesture) { |
+ RenderFrameProxyHost* proxy_to_embedder = GetProxyToEmbedder(); |
+ if (proxy_to_embedder) { |
+ DCHECK(render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs( |
+ "chrome-guest")); |
+ // TODO(lazyboy): This probably breaks guest visibility. |
+ current_host()->GetView()->Show(); |
Charlie Reis
2015/05/19 07:12:31
Any thoughts yet on where this belongs? I don't t
lazyboy
2015/05/21 23:23:47
Not entirely yet, I've moved this outside of conte
|
+ } |
+ |
if (!pending_render_frame_host_ && !speculative_render_frame_host_) { |
DCHECK_IMPLIES(should_reuse_web_ui_, web_ui_); |
@@ -1623,6 +1647,35 @@ void RenderFrameHostManager::EnsureRenderViewInitialized( |
proxy->set_render_frame_proxy_created(true); |
} |
+int RenderFrameHostManager::CreateEmbedderProxy( |
+ SiteInstance* embedder_site_instance) { |
+ CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSitePerProcess)); |
+ int embedder_proxy_flags = CREATE_RF_HIDDEN | CREATE_RF_SWAPPED_OUT | |
+ CREATE_RF_FOR_MAIN_FRAME_NAVIGATION; |
+ int swapped_out_render_view_routing_id; // Unused. |
+ scoped_ptr<RenderFrameHostImpl> swapped_out_embedder_rfh = CreateRenderFrame( |
+ embedder_site_instance, nullptr, |
+ MSG_ROUTING_NONE, // opener_route_id |
+ embedder_proxy_flags, &swapped_out_render_view_routing_id); |
+ |
+ RenderFrameProxyHost* rfph_in_embedder = |
+ GetRenderFrameProxyHost(embedder_site_instance); |
+ CHECK(rfph_in_embedder); |
Charlie Reis
2015/05/19 07:12:31
DCHECK is sufficient if you want to document the i
lazyboy
2015/05/21 23:23:47
Done.
|
+ return rfph_in_embedder->GetRoutingID(); |
+} |
+ |
+void RenderFrameHostManager::ReplaceWithGuestProxy( |
+ int proxy_to_embedder_routing_id) { |
+ current_frame_host()->Send(new FrameMsg_SwapOut( |
+ current_frame_host()->GetRoutingID(), proxy_to_embedder_routing_id, |
+ false /* is_loading */, content::FrameReplicationState())); |
+} |
+ |
+void RenderFrameHostManager::SetGuestRWHView(RenderWidgetHostView* child_rwhv) { |
+ GetProxyToEmbedder()->SetChildRWHView(child_rwhv); |
+} |
+ |
bool RenderFrameHostManager::InitRenderView( |
RenderViewHostImpl* render_view_host, |
int opener_route_id, |