| 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 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1101 for_main_frame_navigation); | 1101 for_main_frame_navigation); |
| 1102 if (success) { | 1102 if (success) { |
| 1103 if (frame_tree_node_->IsMainFrame()) { | 1103 if (frame_tree_node_->IsMainFrame()) { |
| 1104 // Don't show the main frame's view until we get a DidNavigate from it. | 1104 // Don't show the main frame's view until we get a DidNavigate from it. |
| 1105 render_view_host->GetView()->Hide(); | 1105 render_view_host->GetView()->Hide(); |
| 1106 } else if (!swapped_out) { | 1106 } else if (!swapped_out) { |
| 1107 // Init the RFH, so a RenderFrame is created in the renderer. | 1107 // Init the RFH, so a RenderFrame is created in the renderer. |
| 1108 DCHECK(new_render_frame_host.get()); | 1108 DCHECK(new_render_frame_host.get()); |
| 1109 success = InitRenderFrame(new_render_frame_host.get()); | 1109 success = InitRenderFrame(new_render_frame_host.get()); |
| 1110 } | 1110 } |
| 1111 if (swapped_out) { | |
| 1112 proxy_hosts_[instance->GetId()]->InitRenderFrameProxy(); | |
| 1113 } | |
| 1114 } else if (!swapped_out && pending_render_frame_host_) { | 1111 } else if (!swapped_out && pending_render_frame_host_) { |
| 1115 CancelPending(); | 1112 CancelPending(); |
| 1116 } | 1113 } |
| 1117 routing_id = render_view_host->GetRoutingID(); | 1114 routing_id = render_view_host->GetRoutingID(); |
| 1118 frame_to_announce = new_render_frame_host.get(); | 1115 frame_to_announce = new_render_frame_host.get(); |
| 1119 } | 1116 } |
| 1120 | 1117 |
| 1121 // Use this as our new pending RFH if it isn't swapped out. | 1118 // Use this as our new pending RFH if it isn't swapped out. |
| 1122 if (!swapped_out) | 1119 if (!swapped_out) |
| 1123 pending_render_frame_host_ = new_render_frame_host.Pass(); | 1120 pending_render_frame_host_ = new_render_frame_host.Pass(); |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1594 void RenderFrameHostManager::DeleteRenderFrameProxyHost( | 1591 void RenderFrameHostManager::DeleteRenderFrameProxyHost( |
| 1595 SiteInstance* instance) { | 1592 SiteInstance* instance) { |
| 1596 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId()); | 1593 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId()); |
| 1597 if (iter != proxy_hosts_.end()) { | 1594 if (iter != proxy_hosts_.end()) { |
| 1598 delete iter->second; | 1595 delete iter->second; |
| 1599 proxy_hosts_.erase(iter); | 1596 proxy_hosts_.erase(iter); |
| 1600 } | 1597 } |
| 1601 } | 1598 } |
| 1602 | 1599 |
| 1603 } // namespace content | 1600 } // namespace content |
| OLD | NEW |