Fixing a problem, where a hung renderer process is not killed when navigating away

content/browser/renderer_host/resource_dispatcher_host_impl.cc

Index: content/browser/renderer_host/resource_dispatcher_host_impl.cc
diff --git a/content/browser/renderer_host/resource_dispatcher_host_impl.cc b/content/browser/renderer_host/resource_dispatcher_host_impl.cc
index d7ea8ad9b7a536e511d4b4a27483804487b78132..b1fe8899f494ed08545c0040dabee9bc2112cdb9 100644
--- a/content/browser/renderer_host/resource_dispatcher_host_impl.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host_impl.cc
@@ -288,11 +288,12 @@ net::RequestPriority DetermineRequestPriority(ResourceType::Type type) {
   }
 }
 
-void OnSwapOutACKHelper(int render_process_id, int render_view_id) {
+void OnSwapOutACKHelper(int render_process_id, int render_view_id,
+    bool timed_out) {

[Charlie Reis, 2012/04/06 22:34:14]

For method declarations that spill over, each argument should be on its own
line, aligned with the open paren if possible.

[nasko, 2012/04/10 00:16:37]

Done.

[Charlie Reis, 2012/04/10 01:19:35]

Almost.  :)  For method declarations (as opposed to call sites), render_view_id
needs to be on its own line as well.

http://www.chromium.org/developers/coding-style
"For function declarations and definitions, put each argument on a separate line
unless everything fits on one line. [...] When calling a function, however, feel
free to collapse things to take less space.  Do whatever seems most readable."

[nasko, 2012/04/10 14:31:26]

Done.

   RenderViewHostImpl* rvh = RenderViewHostImpl::FromID(render_process_id,
                                                        render_view_id);
   if (rvh)
-    rvh->OnSwapOutACK();
+    rvh->OnSwapOutACK(timed_out);
 }
 
 net::Error CallbackAndReturn(
@@ -1083,8 +1084,19 @@ ResourceRequestInfoImpl* ResourceDispatcherHostImpl::CreateRequestInfo(
       context);
 }
 
+
 void ResourceDispatcherHostImpl::OnSwapOutACK(
+  const ViewMsg_SwapOut_Params& params) {
+  OnSwapOutACKImpl(params, false);
+}
+
+void ResourceDispatcherHostImpl::OnSimulateSwapOutACK(
     const ViewMsg_SwapOut_Params& params) {
+  OnSwapOutACKImpl(params, true);

[Charlie Reis, 2012/04/06 22:34:14]

Let's add a comment saying that true means it's considered timed_out.

[nasko, 2012/04/10 00:16:37]

Done.

+}
+
+void ResourceDispatcherHostImpl::OnSwapOutACKImpl(

[Charlie Reis, 2012/04/06 22:34:14]

nit: HandleSwapOutACK

[nasko, 2012/04/10 00:16:37]

Done.

+    const ViewMsg_SwapOut_Params& params, bool timed_out) {
   // Closes for cross-site transitions are handled such that the cross-site
   // transition continues.
   GlobalRequestID global_id(params.new_render_process_host_id,
@@ -1103,7 +1115,8 @@ void ResourceDispatcherHostImpl::OnSwapOutACK(
       FROM_HERE,
       base::Bind(&OnSwapOutACKHelper,
                  params.closing_process_id,
-                 params.closing_route_id));
+                 params.closing_route_id,
+                 timed_out));
 }
 
 void ResourceDispatcherHostImpl::OnDidLoadResourceFromMemoryCache(