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

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: Add browser test. 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 35875c5747a736076a20322c658e6b0137d7783f..d579d2208646dd5d01fe223ab2aaf1e8532e6447 100644
--- a/content/browser/renderer_host/resource_dispatcher_host.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host.cc
@@ -656,13 +656,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'.

Powered by Google App Engine
This is Rietveld 408576698