| 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 46ddfa26acfde24fcf4f5a1b1d834452f8fe95b2..f04b78fa75aa229332f83cad4013289de9e88930 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager.cc
|
| +++ b/content/browser/frame_host/render_frame_host_manager.cc
|
| @@ -632,6 +632,10 @@ void RenderFrameHostManager::SwapOutOldFrame(
|
| CreateRenderFrameProxyHost(old_render_frame_host->GetSiteInstance(),
|
| old_render_frame_host->render_view_host());
|
|
|
| + // Reset any NavigationHandle in the RenderFrameHost. This will prevent any
|
| + // ongoing navigation from attempting to transfer.
|
| + old_render_frame_host->SetNavigationHandle(nullptr);
|
| +
|
| // Tell the old RenderFrameHost to swap out and be replaced by the proxy.
|
| old_render_frame_host->SwapOut(proxy, true);
|
|
|
|
|