| 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 65   return true; | 65   return true; | 
| 66 } | 66 } | 
| 67 | 67 | 
| 68 bool CreateProxyForSiteInstance(FrameTreeNode* source_node, | 68 bool CreateProxyForSiteInstance(FrameTreeNode* source_node, | 
| 69                                 const scoped_refptr<SiteInstance>& instance, | 69                                 const scoped_refptr<SiteInstance>& instance, | 
| 70                                 FrameTreeNode* node) { | 70                                 FrameTreeNode* node) { | 
| 71   // Skip the node that initiated the creation. | 71   // Skip the node that initiated the creation. | 
| 72   if (source_node == node) | 72   if (source_node == node) | 
| 73     return true; | 73     return true; | 
| 74 | 74 | 
| 75   node->render_manager()->CreateRenderFrameProxy(instance); | 75   node->render_manager()->CreateRenderFrameProxy(instance.get()); | 
| 76   return true; | 76   return true; | 
| 77 } | 77 } | 
| 78 | 78 | 
| 79 }  // namespace | 79 }  // namespace | 
| 80 | 80 | 
| 81 FrameTree::FrameTree(Navigator* navigator, | 81 FrameTree::FrameTree(Navigator* navigator, | 
| 82                      RenderFrameHostDelegate* render_frame_delegate, | 82                      RenderFrameHostDelegate* render_frame_delegate, | 
| 83                      RenderViewHostDelegate* render_view_delegate, | 83                      RenderViewHostDelegate* render_view_delegate, | 
| 84                      RenderWidgetHostDelegate* render_widget_delegate, | 84                      RenderWidgetHostDelegate* render_widget_delegate, | 
| 85                      RenderFrameHostManager::Delegate* manager_delegate) | 85                      RenderFrameHostManager::Delegate* manager_delegate) | 
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 322         rvh->Shutdown(); | 322         rvh->Shutdown(); | 
| 323         render_view_host_pending_shutdown_map_.erase(multi_iter); | 323         render_view_host_pending_shutdown_map_.erase(multi_iter); | 
| 324       } | 324       } | 
| 325       break; | 325       break; | 
| 326     } | 326     } | 
| 327     CHECK(render_view_host_found); | 327     CHECK(render_view_host_found); | 
| 328   } | 328   } | 
| 329 } | 329 } | 
| 330 | 330 | 
| 331 }  // namespace content | 331 }  // namespace content | 
| OLD | NEW | 
|---|