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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
48 : routing_id_(site_instance->GetProcess()->GetNextRoutingID()), | 48 : routing_id_(site_instance->GetProcess()->GetNextRoutingID()), |
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 bool is_proxy_to_parent = !frame_tree_node_->IsMainFrame() && | |
59 frame_tree_node_->parent() | |
60 ->render_manager() | |
61 ->current_frame_host() | |
62 ->GetSiteInstance() == site_instance; | |
58 | 63 |
59 if (!frame_tree_node_->IsMainFrame() && | 64 // If this is a proxy to parent frame or this proxy is for the inner |
60 frame_tree_node_->parent() | 65 // WebContents' FTN in outer WebContents' process, then we need a |
Charlie Reis
2015/05/22 23:44:31
nit: WebContents's
nit: FrameTreeNode
lazyboy
2015/05/26 16:32:54
Done.
| |
61 ->render_manager() | 66 // CrossProcessFrameConnector. |
62 ->current_frame_host() | 67 if (is_proxy_to_parent || frame_tree_node_->render_manager()->IsGuest()) { |
63 ->GetSiteInstance() == site_instance) { | |
64 // The RenderFrameHost navigating cross-process is destroyed and a proxy for | 68 // The RenderFrameHost navigating cross-process is destroyed and a proxy for |
65 // it is created in the parent's process. CrossProcessFrameConnector | 69 // it is created in the parent's process. CrossProcessFrameConnector |
66 // initialization only needs to happen on an initial cross-process | 70 // initialization only needs to happen on an initial cross-process |
67 // navigation, when the RenderFrameHost leaves the same process as its | 71 // navigation, when the RenderFrameHost leaves the same process as its |
68 // parent. The same CrossProcessFrameConnector is used for subsequent cross- | 72 // parent. The same CrossProcessFrameConnector is used for subsequent cross- |
69 // process navigations, but it will be destroyed if the frame is | 73 // process navigations, but it will be destroyed if the frame is |
70 // navigated back to the same SiteInstance as its parent. | 74 // navigated back to the same SiteInstance as its parent. |
71 cross_process_frame_connector_.reset(new CrossProcessFrameConnector(this)); | 75 cross_process_frame_connector_.reset(new CrossProcessFrameConnector(this)); |
72 } | 76 } |
73 } | 77 } |
(...skipping 11 matching lines...) Expand all Loading... | |
85 GetProcess()->RemoveRoute(routing_id_); | 89 GetProcess()->RemoveRoute(routing_id_); |
86 g_routing_id_frame_proxy_map.Get().erase( | 90 g_routing_id_frame_proxy_map.Get().erase( |
87 RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_)); | 91 RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_)); |
88 } | 92 } |
89 | 93 |
90 void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) { | 94 void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) { |
91 cross_process_frame_connector_->set_view( | 95 cross_process_frame_connector_->set_view( |
92 static_cast<RenderWidgetHostViewChildFrame*>(view)); | 96 static_cast<RenderWidgetHostViewChildFrame*>(view)); |
93 } | 97 } |
94 | 98 |
99 // TODO(lazyboy): We can probably cache a pointer to RVH in this class | |
100 // as we do in RenderFrameHostImpl. | |
nasko
2015/05/22 16:32:27
I have a CL that does just that, but got reverted.
lazyboy
2015/05/26 16:32:54
This function has been moved now.
| |
95 RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() { | 101 RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() { |
96 return frame_tree_node_->frame_tree()->GetRenderViewHost( | 102 // RVH of outer WebContents' SiteInstance does not live in the RFHM of the |
nasko
2015/05/22 16:32:27
Hmmm, this strikes me as odd and possibly wrong. A
Charlie Reis
2015/05/22 23:44:31
+1. The RVH for a proxy should be in the same tre
lazyboy
2015/05/26 16:32:54
This is required because RWHVChildFrame needed to
| |
97 site_instance_.get()); | 103 // inner WebContents, we need to look it up in the FrameTree of the outer |
104 // WebContents. | |
105 RenderFrameProxyHost* proxy_to_outer_contents = | |
106 frame_tree_node_->render_manager()->GetProxyToOuterContents(); | |
107 FrameTree* frame_tree = | |
108 proxy_to_outer_contents && | |
109 proxy_to_outer_contents->GetSiteInstance() == GetSiteInstance() | |
110 ? proxy_to_outer_contents->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 CHECK(render_frame_host_ == nullptr); | 117 CHECK(render_frame_host_ == nullptr); |
103 render_frame_host_ = render_frame_host.Pass(); | 118 render_frame_host_ = render_frame_host.Pass(); |
104 render_frame_host_->set_render_frame_proxy_host(this); | 119 render_frame_host_->set_render_frame_proxy_host(this); |
105 } | 120 } |
106 | 121 |
107 scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() { | 122 scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() { |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
268 base::Bind(&MessagePortMessageFilter::RouteMessageEventWithMessagePorts, | 283 base::Bind(&MessagePortMessageFilter::RouteMessageEventWithMessagePorts, |
269 message_port_message_filter, target_rfh->GetRoutingID(), | 284 message_port_message_filter, target_rfh->GetRoutingID(), |
270 new_params)); | 285 new_params)); |
271 } else { | 286 } else { |
272 target_rfh->Send( | 287 target_rfh->Send( |
273 new FrameMsg_PostMessageEvent(target_rfh->GetRoutingID(), new_params)); | 288 new FrameMsg_PostMessageEvent(target_rfh->GetRoutingID(), new_params)); |
274 } | 289 } |
275 } | 290 } |
276 | 291 |
277 } // namespace content | 292 } // namespace content |
OLD | NEW |