| 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 | 189 |
| 190 render_view_host_map_[site_instance->GetId()] = | 190 render_view_host_map_[site_instance->GetId()] = |
| 191 RenderViewHostRefCount(rvh, 0); | 191 RenderViewHostRefCount(rvh, 0); |
| 192 return rvh; | 192 return rvh; |
| 193 } | 193 } |
| 194 | 194 |
| 195 RenderViewHostImpl* FrameTree::GetRenderViewHostForSubFrame( | 195 RenderViewHostImpl* FrameTree::GetRenderViewHostForSubFrame( |
| 196 SiteInstance* site_instance) { | 196 SiteInstance* site_instance) { |
| 197 RenderViewHostMap::iterator iter = | 197 RenderViewHostMap::iterator iter = |
| 198 render_view_host_map_.find(site_instance->GetId()); | 198 render_view_host_map_.find(site_instance->GetId()); |
| 199 CHECK(iter != render_view_host_map_.end()); | 199 // TODO(creis): Mirror the frame tree so this check can't fail. |
| 200 if (iter == render_view_host_map_.end()) |
| 201 return NULL; |
| 200 RenderViewHostRefCount rvh_refcount = iter->second; | 202 RenderViewHostRefCount rvh_refcount = iter->second; |
| 201 return rvh_refcount.first; | 203 return rvh_refcount.first; |
| 202 } | 204 } |
| 203 | 205 |
| 204 void FrameTree::RegisterRenderFrameHost( | 206 void FrameTree::RegisterRenderFrameHost( |
| 205 RenderFrameHostImpl* render_frame_host) { | 207 RenderFrameHostImpl* render_frame_host) { |
| 206 SiteInstance* site_instance = | 208 SiteInstance* site_instance = |
| 207 render_frame_host->render_view_host()->GetSiteInstance(); | 209 render_frame_host->render_view_host()->GetSiteInstance(); |
| 208 RenderViewHostMap::iterator iter = | 210 RenderViewHostMap::iterator iter = |
| 209 render_view_host_map_.find(site_instance->GetId()); | 211 render_view_host_map_.find(site_instance->GetId()); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 232 } | 234 } |
| 233 } | 235 } |
| 234 | 236 |
| 235 FrameTreeNode* FrameTree::FindByFrameID(int64 frame_id) { | 237 FrameTreeNode* FrameTree::FindByFrameID(int64 frame_id) { |
| 236 FrameTreeNode* node = NULL; | 238 FrameTreeNode* node = NULL; |
| 237 ForEach(base::Bind(&FrameTreeNodeForFrameId, frame_id, &node)); | 239 ForEach(base::Bind(&FrameTreeNodeForFrameId, frame_id, &node)); |
| 238 return node; | 240 return node; |
| 239 } | 241 } |
| 240 | 242 |
| 241 } // namespace content | 243 } // namespace content |
| OLD | NEW |