Index: content/browser/frame_host/render_frame_host_manager.cc |
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc |
index ef2fa0114a36baeefc984419891870da87633311..76f44b1888c2c12df126a453de5176470669c71c 100644 |
--- a/content/browser/frame_host/render_frame_host_manager.cc |
+++ b/content/browser/frame_host/render_frame_host_manager.cc |
@@ -264,13 +264,13 @@ RenderFrameHostImpl* RenderFrameHostManager::Navigate( |
} |
void RenderFrameHostManager::Stop() { |
- render_frame_host_->render_view_host()->Stop(); |
+ render_frame_host_->Stop(); |
// If we are cross-navigating, we should stop the pending renderers. This |
// will lead to a DidFailProvisionalLoad, which will properly destroy them. |
if (cross_navigation_pending_) { |
- pending_render_frame_host_->render_view_host()->Send(new ViewMsg_Stop( |
- pending_render_frame_host_->render_view_host()->GetRoutingID())); |
+ pending_render_frame_host_->Send(new FrameMsg_Stop( |
+ pending_render_frame_host_->GetRoutingID())); |
} |
} |
@@ -1544,12 +1544,6 @@ RenderFrameHostImpl* RenderFrameHostManager::UpdateStateForNavigate( |
DCHECK(pending_nav_params_->global_request_id == |
entry.transferred_global_request_id()); |
} else { |
- // Also make sure the old render view stops, in case a load is in |
- // progress. (We don't want to do this for transfers, since it will |
- // interrupt the transfer with an unexpected DidStopLoading.) |
- render_frame_host_->render_view_host()->Send(new ViewMsg_Stop( |
Charlie Reis
2014/08/19 21:32:32
Can you remind me why this is unsafe to remove? I
nasko
2014/08/20 14:15:17
RF::OnSwapOut does the stop, but I realized that t
|
- render_frame_host_->render_view_host()->GetRoutingID())); |
- |
pending_render_frame_host_->SetNavigationsSuspended(true, |
base::TimeTicks()); |