| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "chrome/browser/tab_contents/render_view_host_manager.h" | 5 #include "chrome/browser/tab_contents/render_view_host_manager.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "chrome/browser/renderer_host/render_view_host.h" | 9 #include "chrome/browser/renderer_host/render_view_host.h" |
| 10 #include "chrome/browser/renderer_host/render_view_host_delegate.h" | 10 #include "chrome/browser/renderer_host/render_view_host_delegate.h" |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 if (pending_render_view_host_->are_navigations_suspended()) | 141 if (pending_render_view_host_->are_navigations_suspended()) |
| 142 pending_render_view_host_->SetNavigationsSuspended(false); | 142 pending_render_view_host_->SetNavigationsSuspended(false); |
| 143 } else { | 143 } else { |
| 144 // The request has been started and paused, while we're waiting for the | 144 // The request has been started and paused, while we're waiting for the |
| 145 // unload handler to finish. We'll pretend that it did, by notifying the | 145 // unload handler to finish. We'll pretend that it did, by notifying the |
| 146 // IO thread to let the response continue. The pending renderer will then | 146 // IO thread to let the response continue. The pending renderer will then |
| 147 // be swapped in as part of the usual DidNavigate logic. (If the unload | 147 // be swapped in as part of the usual DidNavigate logic. (If the unload |
| 148 // handler later finishes, this call will be ignored because the state in | 148 // handler later finishes, this call will be ignored because the state in |
| 149 // CrossSiteResourceHandler will already be cleaned up.) | 149 // CrossSiteResourceHandler will already be cleaned up.) |
| 150 current_host()->process()->CrossSiteClosePageACK( | 150 current_host()->process()->CrossSiteClosePageACK( |
| 151 pending_render_view_host_->site_instance()->process_host_id(), | 151 pending_render_view_host_->process()->pid(), pending_request_id); |
| 152 pending_request_id); | |
| 153 } | 152 } |
| 154 return false; | 153 return false; |
| 155 } | 154 } |
| 156 | 155 |
| 157 void RenderViewHostManager::DidNavigateMainFrame( | 156 void RenderViewHostManager::DidNavigateMainFrame( |
| 158 RenderViewHost* render_view_host) { | 157 RenderViewHost* render_view_host) { |
| 159 if (!cross_navigation_pending_) { | 158 if (!cross_navigation_pending_) { |
| 160 // We should only hear this from our current renderer. | 159 // We should only hear this from our current renderer. |
| 161 DCHECK(render_view_host == render_view_host_); | 160 DCHECK(render_view_host == render_view_host_); |
| 162 return; | 161 return; |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 pending_render_view_host_ = NULL; | 543 pending_render_view_host_ = NULL; |
| 545 pending_render_view_host->Shutdown(); | 544 pending_render_view_host->Shutdown(); |
| 546 } | 545 } |
| 547 | 546 |
| 548 void RenderViewHostManager::CrossSiteNavigationCanceled() { | 547 void RenderViewHostManager::CrossSiteNavigationCanceled() { |
| 549 DCHECK(cross_navigation_pending_); | 548 DCHECK(cross_navigation_pending_); |
| 550 cross_navigation_pending_ = false; | 549 cross_navigation_pending_ = false; |
| 551 if (pending_render_view_host_) | 550 if (pending_render_view_host_) |
| 552 CancelPendingRenderView(); | 551 CancelPendingRenderView(); |
| 553 } | 552 } |
| OLD | NEW |