Merge 21531 - Fix a race condition where rapid back/forward clicks could clos...

chrome/browser/renderer_host/render_view_host.cc

 // Copyright (c) 2009 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 "chrome/browser/renderer_host/render_view_host.h"
 
 #include <string>
 #include <vector>
 
 #include "app/resource_bundle.h"
@@ skipping 302 matching lines @@
   // button), so this test makes sure we only send the message once.
   if (!is_waiting_for_unload_ack_) {
     // Start the hang monitor in case the renderer hangs in the beforeunload
     // handler.
     is_waiting_for_unload_ack_ = true;
     StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
     Send(new ViewMsg_ShouldClose(routing_id()));
   }
 }
 
-void RenderViewHost::FirePageUnload() {
-  ClosePage(process()->pid(), routing_id());
-}
-
-// static
-void RenderViewHost::ClosePageIgnoringUnloadEvents(int render_process_host_id,
-                                                   int request_id) {
-  RenderViewHost* rvh = RenderViewHost::FromID(render_process_host_id,
-                                               request_id);
-  if (!rvh)
-    return;
-
-  rvh->StopHangMonitorTimeout();
-  rvh->is_waiting_for_unload_ack_ = false;
-
-  rvh->set_sudden_termination_allowed(true);
-  rvh->delegate()->Close(rvh);
-}
-
-void RenderViewHost::ClosePage(int new_render_process_host_id,
+void RenderViewHost::ClosePage(bool for_cross_site_transition,
+                               int new_render_process_host_id,
                                int new_request_id) {
   // Start the hang monitor in case the renderer hangs in the unload handler.
   is_waiting_for_unload_ack_ = true;
   StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
 
+  ViewMsg_ClosePage_Params params;
+  params.closing_process_id = process()->pid();
+  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()) {
-    Send(new ViewMsg_ClosePage(routing_id(),
-                               new_render_process_host_id,
-                               new_request_id));
+    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(new_render_process_host_id,
-                                     new_request_id);
+    process()->CrossSiteClosePageACK(params);
   }
 }
 
+void RenderViewHost::ClosePageIgnoringUnloadEvents() {
+  StopHangMonitorTimeout();
+  is_waiting_for_unload_ack_ = false;
+
+  sudden_termination_allowed_ = true;
+  delegate_->Close(this);
+}
+
 void RenderViewHost::SetHasPendingCrossSiteRequest(bool has_pending_request,
                                                    int request_id) {
   Singleton<CrossSiteRequestManager>()->SetHasPendingCrossSiteRequest(
       process()->pid(), routing_id(), has_pending_request);
   pending_request_id_ = request_id;
 }
 
 int RenderViewHost::GetPendingRequestId() {
   return pending_request_id_;
 }
@@ skipping 1205 matching lines @@
 
 void RenderViewHost::SignalModalDialogEvent() {
   if (modal_dialog_count_++ == 0)
     modal_dialog_event_->Signal();
 }
 
 void RenderViewHost::ResetModalDialogEvent() {
  if (--modal_dialog_count_ == 0)
    modal_dialog_event_->Reset();
 }