OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/frame_tree.h" | 5 #include "content/browser/frame_host/frame_tree.h" |
6 | 6 |
7 #include <queue> | 7 #include <queue> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 | 47 |
48 // Iterate over the FrameTree to reset any node affected by the loss of the | 48 // Iterate over the FrameTree to reset any node affected by the loss of the |
49 // given RenderViewHost's process. | 49 // given RenderViewHost's process. |
50 bool ResetNodesForNewProcess(RenderViewHost* render_view_host, | 50 bool ResetNodesForNewProcess(RenderViewHost* render_view_host, |
51 FrameTreeNode* node) { | 51 FrameTreeNode* node) { |
52 if (render_view_host == node->current_frame_host()->render_view_host()) | 52 if (render_view_host == node->current_frame_host()->render_view_host()) |
53 node->ResetForNewProcess(); | 53 node->ResetForNewProcess(); |
54 return true; | 54 return true; |
55 } | 55 } |
56 | 56 |
| 57 bool CreateProxyForSiteInstance(FrameTreeNode* source_node, |
| 58 const scoped_refptr<SiteInstance>& instance, |
| 59 FrameTreeNode* node) { |
| 60 // Skip the node that initiated the creation. |
| 61 if (source_node == node) |
| 62 return true; |
| 63 |
| 64 node->render_manager()->CreateRenderFrameProxy(instance); |
| 65 return true; |
| 66 } |
| 67 |
57 } // namespace | 68 } // namespace |
58 | 69 |
59 FrameTree::FrameTree(Navigator* navigator, | 70 FrameTree::FrameTree(Navigator* navigator, |
60 RenderFrameHostDelegate* render_frame_delegate, | 71 RenderFrameHostDelegate* render_frame_delegate, |
61 RenderViewHostDelegate* render_view_delegate, | 72 RenderViewHostDelegate* render_view_delegate, |
62 RenderWidgetHostDelegate* render_widget_delegate, | 73 RenderWidgetHostDelegate* render_widget_delegate, |
63 RenderFrameHostManager::Delegate* manager_delegate) | 74 RenderFrameHostManager::Delegate* manager_delegate) |
64 : render_frame_delegate_(render_frame_delegate), | 75 : render_frame_delegate_(render_frame_delegate), |
65 render_view_delegate_(render_view_delegate), | 76 render_view_delegate_(render_view_delegate), |
66 render_widget_delegate_(render_widget_delegate), | 77 render_widget_delegate_(render_widget_delegate), |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 | 139 |
129 // Notify observers of the frame removal. | 140 // Notify observers of the frame removal. |
130 RenderFrameHostImpl* render_frame_host = child->current_frame_host(); | 141 RenderFrameHostImpl* render_frame_host = child->current_frame_host(); |
131 if (!on_frame_removed_.is_null()) { | 142 if (!on_frame_removed_.is_null()) { |
132 on_frame_removed_.Run(render_frame_host); | 143 on_frame_removed_.Run(render_frame_host); |
133 } | 144 } |
134 | 145 |
135 parent->RemoveChild(child); | 146 parent->RemoveChild(child); |
136 } | 147 } |
137 | 148 |
| 149 void FrameTree::CreateProxiesForSiteInstance( |
| 150 FrameTreeNode* source, |
| 151 SiteInstance* site_instance) { |
| 152 // Create the swapped out RVH for the new SiteInstance. This will create |
| 153 // a top-level swapped out RFH as well, which will then be wrapped by a |
| 154 // RenderFrameProxyHost. |
| 155 if (!source->IsMainFrame()) { |
| 156 RenderViewHostImpl* render_view_host = |
| 157 source->frame_tree()->GetRenderViewHost(site_instance); |
| 158 if (!render_view_host) { |
| 159 root()->render_manager()->CreateRenderFrame(site_instance, |
| 160 MSG_ROUTING_NONE, |
| 161 true, |
| 162 false, |
| 163 true); |
| 164 } |
| 165 } |
| 166 |
| 167 scoped_refptr<SiteInstance> instance(site_instance); |
| 168 ForEach(base::Bind(&CreateProxyForSiteInstance, source, instance)); |
| 169 } |
| 170 |
138 void FrameTree::ResetForMainFrameSwap() { | 171 void FrameTree::ResetForMainFrameSwap() { |
139 root_->ResetForNewProcess(); | 172 root_->ResetForNewProcess(); |
140 focused_frame_tree_node_id_ = -1; | 173 focused_frame_tree_node_id_ = -1; |
141 } | 174 } |
142 | 175 |
143 void FrameTree::RenderProcessGone(RenderViewHost* render_view_host) { | 176 void FrameTree::RenderProcessGone(RenderViewHost* render_view_host) { |
144 // Walk the full tree looking for nodes that may be affected. Once a frame | 177 // Walk the full tree looking for nodes that may be affected. Once a frame |
145 // crashes, all of its child FrameTreeNodes go away. | 178 // crashes, all of its child FrameTreeNodes go away. |
146 // Note that the helper function may call ResetForNewProcess on a node, which | 179 // Note that the helper function may call ResetForNewProcess on a node, which |
147 // clears its children before we iterate over them. That's ok, because | 180 // clears its children before we iterate over them. That's ok, because |
(...skipping 12 matching lines...) Expand all Loading... |
160 | 193 |
161 void FrameTree::SetFocusedFrame(FrameTreeNode* node) { | 194 void FrameTree::SetFocusedFrame(FrameTreeNode* node) { |
162 focused_frame_tree_node_id_ = node->frame_tree_node_id(); | 195 focused_frame_tree_node_id_ = node->frame_tree_node_id(); |
163 } | 196 } |
164 | 197 |
165 void FrameTree::SetFrameRemoveListener( | 198 void FrameTree::SetFrameRemoveListener( |
166 const base::Callback<void(RenderFrameHost*)>& on_frame_removed) { | 199 const base::Callback<void(RenderFrameHost*)>& on_frame_removed) { |
167 on_frame_removed_ = on_frame_removed; | 200 on_frame_removed_ = on_frame_removed; |
168 } | 201 } |
169 | 202 |
170 RenderViewHostImpl* FrameTree::CreateRenderViewHostForMainFrame( | 203 RenderViewHostImpl* FrameTree::CreateRenderViewHost(SiteInstance* site_instance, |
171 SiteInstance* site_instance, | 204 int routing_id, |
172 int routing_id, | 205 int main_frame_routing_id, |
173 int main_frame_routing_id, | 206 bool swapped_out, |
174 bool swapped_out, | 207 bool hidden) { |
175 bool hidden) { | |
176 DCHECK(main_frame_routing_id != MSG_ROUTING_NONE); | 208 DCHECK(main_frame_routing_id != MSG_ROUTING_NONE); |
177 RenderViewHostMap::iterator iter = | 209 RenderViewHostMap::iterator iter = |
178 render_view_host_map_.find(site_instance->GetId()); | 210 render_view_host_map_.find(site_instance->GetId()); |
179 if (iter != render_view_host_map_.end()) { | 211 if (iter != render_view_host_map_.end()) { |
180 // If a RenderViewHost is pending shutdown for this |site_instance|, put it | 212 // If a RenderViewHost is pending shutdown for this |site_instance|, put it |
181 // in the map of RenderViewHosts pending shutdown. Otherwise there should | 213 // in the map of RenderViewHosts pending shutdown. Otherwise return the |
182 // not be a RenderViewHost for the SiteInstance. | 214 // existing RenderViewHost for the SiteInstance. |
183 CHECK_EQ(RenderViewHostImpl::STATE_PENDING_SHUTDOWN, | 215 if (iter->second->rvh_state() == |
184 iter->second->rvh_state()); | 216 RenderViewHostImpl::STATE_PENDING_SHUTDOWN) { |
185 render_view_host_pending_shutdown_map_.insert( | 217 render_view_host_pending_shutdown_map_.insert( |
186 std::pair<int, RenderViewHostImpl*>(site_instance->GetId(), | 218 std::pair<int, RenderViewHostImpl*>(site_instance->GetId(), |
187 iter->second)); | 219 iter->second)); |
188 render_view_host_map_.erase(iter); | 220 render_view_host_map_.erase(iter); |
| 221 } else { |
| 222 return iter->second; |
| 223 } |
189 } | 224 } |
190 RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( | 225 RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( |
191 RenderViewHostFactory::Create(site_instance, | 226 RenderViewHostFactory::Create(site_instance, |
192 render_view_delegate_, | 227 render_view_delegate_, |
193 render_widget_delegate_, | 228 render_widget_delegate_, |
194 routing_id, | 229 routing_id, |
195 main_frame_routing_id, | 230 main_frame_routing_id, |
196 swapped_out, | 231 swapped_out, |
197 hidden)); | 232 hidden)); |
198 | 233 |
199 render_view_host_map_[site_instance->GetId()] = rvh; | 234 render_view_host_map_[site_instance->GetId()] = rvh; |
200 return rvh; | 235 return rvh; |
201 } | 236 } |
202 | 237 |
203 RenderViewHostImpl* FrameTree::GetRenderViewHostForSubFrame( | 238 RenderViewHostImpl* FrameTree::GetRenderViewHost(SiteInstance* site_instance) { |
204 SiteInstance* site_instance) { | |
205 RenderViewHostMap::iterator iter = | 239 RenderViewHostMap::iterator iter = |
206 render_view_host_map_.find(site_instance->GetId()); | 240 render_view_host_map_.find(site_instance->GetId()); |
207 // TODO(creis): Mirror the frame tree so this check can't fail. | 241 // TODO(creis): Mirror the frame tree so this check can't fail. |
208 if (iter == render_view_host_map_.end()) | 242 if (iter == render_view_host_map_.end()) |
209 return NULL; | 243 return NULL; |
210 return iter->second; | 244 return iter->second; |
211 } | 245 } |
212 | 246 |
213 void FrameTree::RegisterRenderFrameHost( | 247 void FrameTree::RegisterRenderFrameHost( |
214 RenderFrameHostImpl* render_frame_host) { | 248 RenderFrameHostImpl* render_frame_host) { |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 rvh->Shutdown(); | 294 rvh->Shutdown(); |
261 render_view_host_pending_shutdown_map_.erase(multi_iter); | 295 render_view_host_pending_shutdown_map_.erase(multi_iter); |
262 } | 296 } |
263 break; | 297 break; |
264 } | 298 } |
265 CHECK(render_view_host_found); | 299 CHECK(render_view_host_found); |
266 } | 300 } |
267 } | 301 } |
268 | 302 |
269 } // namespace content | 303 } // namespace content |
OLD | NEW |