OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/frame_host/render_frame_proxy_host.h" | 5 #include "content/browser/frame_host/render_frame_proxy_host.h" |
6 | 6 |
7 #include "base/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
8 #include "content/browser/bad_message.h" | 8 #include "content/browser/bad_message.h" |
9 #include "content/browser/frame_host/cross_process_frame_connector.h" | 9 #include "content/browser/frame_host/cross_process_frame_connector.h" |
10 #include "content/browser/frame_host/frame_tree.h" | 10 #include "content/browser/frame_host/frame_tree.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
49 site_instance_(site_instance), | 49 site_instance_(site_instance), |
50 process_(site_instance->GetProcess()), | 50 process_(site_instance->GetProcess()), |
51 frame_tree_node_(frame_tree_node), | 51 frame_tree_node_(frame_tree_node), |
52 render_frame_proxy_created_(false) { | 52 render_frame_proxy_created_(false) { |
53 GetProcess()->AddRoute(routing_id_, this); | 53 GetProcess()->AddRoute(routing_id_, this); |
54 CHECK(g_routing_id_frame_proxy_map.Get().insert( | 54 CHECK(g_routing_id_frame_proxy_map.Get().insert( |
55 std::make_pair( | 55 std::make_pair( |
56 RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_), | 56 RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_), |
57 this)).second); | 57 this)).second); |
58 | 58 |
59 if (!frame_tree_node_->IsMainFrame() && | 59 // If this is a proxy to embedder created in the guest's FTN, then we |
Charlie Reis
2015/04/30 23:06:46
If this is a proxy for the guest's FTN in its embe
lazyboy
2015/05/05 07:28:14
Done.
| |
60 // need a CrossProcessFrameConnector. | |
61 bool is_proxy_to_embedder_for_guest = | |
Charlie Reis
2015/04/30 23:06:46
is_proxy_for_guest_in_embedder
lazyboy
2015/05/05 07:28:14
Obsolete.
| |
62 frame_tree_node_->IsMainFrame() && | |
63 frame_tree_node_->render_manager()->current_frame_host() | |
64 ->GetSiteInstance()->GetSiteURL().SchemeIs("chrome-guest"); | |
Charlie Reis
2015/04/30 23:06:46
Seems like there would be better ways to tell whet
lazyboy
2015/05/05 07:28:14
I've changed this to use RFHM::IsGuest() that I've
| |
65 if ((!frame_tree_node_->IsMainFrame() && | |
60 frame_tree_node_->parent() | 66 frame_tree_node_->parent() |
61 ->render_manager() | 67 ->render_manager() |
62 ->current_frame_host() | 68 ->current_frame_host() |
63 ->GetSiteInstance() == site_instance) { | 69 ->GetSiteInstance() == site_instance) || |
70 is_proxy_to_embedder_for_guest) { | |
64 // The RenderFrameHost navigating cross-process is destroyed and a proxy for | 71 // The RenderFrameHost navigating cross-process is destroyed and a proxy for |
65 // it is created in the parent's process. CrossProcessFrameConnector | 72 // it is created in the parent's process. CrossProcessFrameConnector |
66 // initialization only needs to happen on an initial cross-process | 73 // initialization only needs to happen on an initial cross-process |
67 // navigation, when the RenderFrameHost leaves the same process as its | 74 // navigation, when the RenderFrameHost leaves the same process as its |
68 // parent. The same CrossProcessFrameConnector is used for subsequent cross- | 75 // parent. The same CrossProcessFrameConnector is used for subsequent cross- |
69 // process navigations, but it will be destroyed if the frame is | 76 // process navigations, but it will be destroyed if the frame is |
70 // navigated back to the same SiteInstance as its parent. | 77 // navigated back to the same SiteInstance as its parent. |
71 cross_process_frame_connector_.reset(new CrossProcessFrameConnector(this)); | 78 cross_process_frame_connector_.reset(new CrossProcessFrameConnector(this)); |
72 } | 79 } |
73 } | 80 } |
(...skipping 11 matching lines...) Expand all Loading... | |
85 GetProcess()->RemoveRoute(routing_id_); | 92 GetProcess()->RemoveRoute(routing_id_); |
86 g_routing_id_frame_proxy_map.Get().erase( | 93 g_routing_id_frame_proxy_map.Get().erase( |
87 RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_)); | 94 RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_)); |
88 } | 95 } |
89 | 96 |
90 void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) { | 97 void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) { |
91 cross_process_frame_connector_->set_view( | 98 cross_process_frame_connector_->set_view( |
92 static_cast<RenderWidgetHostViewChildFrame*>(view)); | 99 static_cast<RenderWidgetHostViewChildFrame*>(view)); |
93 } | 100 } |
94 | 101 |
102 // TODO(lazyboy): We can probably cache a pointer to RVH in this class | |
103 // as we do in RenderFrameHostImpl. | |
95 RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() { | 104 RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() { |
96 return frame_tree_node_->frame_tree()->GetRenderViewHost( | 105 // RVH of embedder site instance does not live in the guest RFHM, we need |
97 site_instance_.get()); | 106 // to look it up in the embedder's FrameTree. |
107 RenderFrameProxyHost* proxy_to_embedder = | |
108 frame_tree_node_->render_manager()->GetProxyToEmbedder(); | |
109 FrameTree* frame_tree = proxy_to_embedder ? | |
Charlie Reis
2015/04/30 23:06:46
This looks buggy. It uses the embedder's frame tr
lazyboy
2015/05/05 07:28:14
Added to check whether this proxy's site instance
| |
110 proxy_to_embedder->frame_tree_node_->frame_tree() : | |
111 frame_tree_node_->frame_tree(); | |
112 return frame_tree->GetRenderViewHost(site_instance_.get()); | |
98 } | 113 } |
99 | 114 |
100 void RenderFrameProxyHost::TakeFrameHostOwnership( | 115 void RenderFrameProxyHost::TakeFrameHostOwnership( |
101 scoped_ptr<RenderFrameHostImpl> render_frame_host) { | 116 scoped_ptr<RenderFrameHostImpl> render_frame_host) { |
102 render_frame_host_ = render_frame_host.Pass(); | 117 render_frame_host_ = render_frame_host.Pass(); |
103 render_frame_host_->set_render_frame_proxy_host(this); | 118 render_frame_host_->set_render_frame_proxy_host(this); |
104 } | 119 } |
105 | 120 |
106 scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() { | 121 scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() { |
107 render_frame_host_->set_render_frame_proxy_host(NULL); | 122 render_frame_host_->set_render_frame_proxy_host(NULL); |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
256 base::Bind(&MessagePortMessageFilter::RouteMessageEventWithMessagePorts, | 271 base::Bind(&MessagePortMessageFilter::RouteMessageEventWithMessagePorts, |
257 message_port_message_filter, target_rfh->GetRoutingID(), | 272 message_port_message_filter, target_rfh->GetRoutingID(), |
258 new_params)); | 273 new_params)); |
259 } else { | 274 } else { |
260 target_rfh->Send( | 275 target_rfh->Send( |
261 new FrameMsg_PostMessageEvent(target_rfh->GetRoutingID(), new_params)); | 276 new FrameMsg_PostMessageEvent(target_rfh->GetRoutingID(), new_params)); |
262 } | 277 } |
263 } | 278 } |
264 | 279 |
265 } // namespace content | 280 } // namespace content |
OLD | NEW |