Merge 79440 - Clean up unload-related state after the ack is received.

content/browser/renderer_host/render_view_host.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_view_host.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 269 matching lines @@
     is_waiting_for_beforeunload_ack_ = true;
     unload_ack_is_for_cross_site_transition_ = for_cross_site_transition;
     StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
     Send(new ViewMsg_ShouldClose(routing_id()));
   }
 }
 
 void RenderViewHost::ClosePage(bool for_cross_site_transition,
                                int new_render_process_host_id,
                                int new_request_id) {
-  // In most cases, this will not be set to false afterward.  Either the tab
-  // will be closed, or a pending RenderViewHost will replace this one.
+  // This will be set back to false in OnClosePageACK, just before we close the
+  // tab or replace it with a pending RVH.  There are some cases (such as 204
+  // errors) where we'll continue to show this RVH.
   is_waiting_for_unload_ack_ = true;
   // Start the hang monitor in case the renderer hangs in the unload handler.
   StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
 
   ViewMsg_ClosePage_Params params;
   params.closing_process_id = process()->id();
   params.closing_route_id = routing_id();
   params.for_cross_site_transition = for_cross_site_transition;
   params.new_render_process_host_id = new_render_process_host_id;
   params.new_request_id = new_request_id;
   if (IsRenderViewLive()) {
     NotificationService::current()->Notify(
         NotificationType::RENDER_VIEW_HOST_WILL_CLOSE_RENDER_VIEW,
         Source<RenderViewHost>(this),
         NotificationService::NoDetails());
 
     Send(new ViewMsg_ClosePage(routing_id(), params));
   } else {
     // This RenderViewHost doesn't have a live renderer, so just skip closing
     // the page.  We must notify the ResourceDispatcherHost on the IO thread,
     // which we will do through the RenderProcessHost's widget helper.
     process()->CrossSiteClosePageACK(params);
   }
 }
 
+void RenderViewHost::OnClosePageACK(bool for_cross_site_transition) {
+  StopHangMonitorTimeout();
+  is_waiting_for_unload_ack_ = false;
+
+  // If this ClosePageACK is not for a cross-site transition, then it is for an
+  // attempt to close the tab.  We have now finished the unload handler and can
+  // proceed with closing the tab.
+  if (!for_cross_site_transition) {
+    ClosePageIgnoringUnloadEvents();
+  }
+}
+
 void RenderViewHost::ClosePageIgnoringUnloadEvents() {
   StopHangMonitorTimeout();
   is_waiting_for_beforeunload_ack_ = false;
   is_waiting_for_unload_ack_ = false;
 
   sudden_termination_allowed_ = true;
   delegate_->Close(this);
 }
 
 void RenderViewHost::SetHasPendingCrossSiteRequest(bool has_pending_request,
@@ skipping 1375 matching lines @@
     LOG(DFATAL) << "Invalid checked state " << checked_state;
     return;
   }
 
   CommandState state;
   state.is_enabled = is_enabled;
   state.checked_state =
       static_cast<RenderViewCommandCheckedState>(checked_state);
   command_states_[static_cast<RenderViewCommand>(command)] = state;
 }