Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: content/browser/renderer_host/resource_dispatcher_host.cc

Issue 6724026: Clean up unload-related state after the ack is received. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with test flakiness fix CL. Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/resource_dispatcher_host.cc
diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc
index 8c4ff73e7f5a984a8597ec6d2d515c22f29a2a71..9d5e4299e5688d9124b3819d5377b8986ae25a6f 100644
--- a/content/browser/renderer_host/resource_dispatcher_host.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host.cc
@@ -659,13 +659,15 @@ void ResourceDispatcherHost::OnClosePageACK(
info->cross_site_handler()->ResumeResponse();
}
} else {
- // This is a tab close, so just forward the message to close it.
+ // This is a tab close, so we will close the tab in OnClosePageACK.
DCHECK(params.new_render_process_host_id == -1);
DCHECK(params.new_request_id == -1);
- CallRenderViewHost(params.closing_process_id,
- params.closing_route_id,
- &RenderViewHost::ClosePageIgnoringUnloadEvents);
}
+ // Update the RenderViewHost's internal state after the ACK.
+ CallRenderViewHost(params.closing_process_id,
+ params.closing_route_id,
+ &RenderViewHost::OnClosePageACK,
+ params.for_cross_site_transition);
}
// We are explicitly forcing the download of 'url'.
« no previous file with comments | « content/browser/renderer_host/render_view_host_manager_browsertest.cc ('k') | net/tools/testserver/testserver.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698