| 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/render_frame_host_manager.h" | 5 #include "content/browser/frame_host/render_frame_host_manager.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1211 site_instance, view_routing_id, frame_routing_id, swapped_out, hidden); | 1211 site_instance, view_routing_id, frame_routing_id, swapped_out, hidden); |
| 1212 } else { | 1212 } else { |
| 1213 render_view_host = frame_tree->GetRenderViewHost(site_instance); | 1213 render_view_host = frame_tree->GetRenderViewHost(site_instance); |
| 1214 | 1214 |
| 1215 CHECK(render_view_host); | 1215 CHECK(render_view_host); |
| 1216 } | 1216 } |
| 1217 | 1217 |
| 1218 // TODO(creis): Pass hidden to RFH. | 1218 // TODO(creis): Pass hidden to RFH. |
| 1219 scoped_ptr<RenderFrameHostImpl> render_frame_host = make_scoped_ptr( | 1219 scoped_ptr<RenderFrameHostImpl> render_frame_host = make_scoped_ptr( |
| 1220 RenderFrameHostFactory::Create( | 1220 RenderFrameHostFactory::Create( |
| 1221 render_view_host, render_frame_delegate_, render_widget_delegate_, | 1221 site_instance, render_view_host, render_frame_delegate_, |
| 1222 frame_tree, frame_tree_node_, frame_routing_id, flags).release()); | 1222 render_widget_delegate_, frame_tree, frame_tree_node_, |
| 1223 frame_routing_id, flags).release()); |
| 1223 return render_frame_host.Pass(); | 1224 return render_frame_host.Pass(); |
| 1224 } | 1225 } |
| 1225 | 1226 |
| 1226 // PlzNavigate | 1227 // PlzNavigate |
| 1227 bool RenderFrameHostManager::CreateSpeculativeRenderFrameHost( | 1228 bool RenderFrameHostManager::CreateSpeculativeRenderFrameHost( |
| 1228 const GURL& url, | 1229 const GURL& url, |
| 1229 SiteInstance* old_instance, | 1230 SiteInstance* old_instance, |
| 1230 SiteInstance* new_instance, | 1231 SiteInstance* new_instance, |
| 1231 int bindings) { | 1232 int bindings) { |
| 1232 CHECK(new_instance); | 1233 CHECK(new_instance); |
| (...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1881 void RenderFrameHostManager::DeleteRenderFrameProxyHost( | 1882 void RenderFrameHostManager::DeleteRenderFrameProxyHost( |
| 1882 SiteInstance* instance) { | 1883 SiteInstance* instance) { |
| 1883 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId()); | 1884 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId()); |
| 1884 if (iter != proxy_hosts_.end()) { | 1885 if (iter != proxy_hosts_.end()) { |
| 1885 delete iter->second; | 1886 delete iter->second; |
| 1886 proxy_hosts_.erase(iter); | 1887 proxy_hosts_.erase(iter); |
| 1887 } | 1888 } |
| 1888 } | 1889 } |
| 1889 | 1890 |
| 1890 } // namespace content | 1891 } // namespace content |
| OLD | NEW |