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

chrome/browser/renderer_host/render_widget_helper.cc

 // Copyright (c) 2006-2008 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_widget_helper.h"
 
 #include "base/eintr_wrapper.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
@@ skipping 66 matching lines @@
 
 void RenderWidgetHelper::CancelResourceRequests(int render_widget_id) {
   if (g_browser_process->io_thread() && render_process_id_ != -1) {
     g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(this,
                           &RenderWidgetHelper::OnCancelResourceRequests,
                           render_widget_id));
   }
 }
 
-void RenderWidgetHelper::CrossSiteClosePageACK(int new_render_process_host_id,
-                                               int new_request_id) {
+void RenderWidgetHelper::CrossSiteClosePageACK(
+    const ViewMsg_ClosePage_Params& params) {
   if (g_browser_process->io_thread()) {
     g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(this,
                           &RenderWidgetHelper::OnCrossSiteClosePageACK,
-                          new_render_process_host_id,
-                          new_request_id));
+                          params));
   }
 }
 
 bool RenderWidgetHelper::WaitForPaintMsg(int render_widget_id,
                                          const base::TimeDelta& max_delay,
                                          IPC::Message* msg) {
   base::TimeTicks time_start = base::TimeTicks::Now();
 
   for (;;) {
     PaintMsgProxy* proxy = NULL;
@@ skipping 84 matching lines @@
     host->OnMessageReceived(proxy->message);
 }
 
 void RenderWidgetHelper::OnCancelResourceRequests(
     int render_widget_id) {
   resource_dispatcher_host_->CancelRequestsForRoute(
       render_process_id_, render_widget_id);
 }
 
 void RenderWidgetHelper::OnCrossSiteClosePageACK(
-    int new_render_process_host_id,
-    int new_request_id) {
-  resource_dispatcher_host_->OnClosePageACK(
-      new_render_process_host_id, new_request_id);
+    ViewMsg_ClosePage_Params params) {
+  resource_dispatcher_host_->OnClosePageACK(params);
 }
 
 void RenderWidgetHelper::CreateNewWindow(int opener_id,
                                          bool user_gesture,
                                          base::ProcessHandle render_process,
                                          int* route_id,
                                          ModalDialogEvent* modal_dialog_event) {
   *route_id = GetNextRoutingID();
 
   ModalDialogEvent modal_dialog_event_internal;
@@ skipping 129 matching lines @@
 
 void RenderWidgetHelper::ClearAllocatedDIBs() {
   for (std::map<TransportDIB::Id, int>::iterator
        i = allocated_dibs_.begin(); i != allocated_dibs_.end(); ++i) {
     HANDLE_EINTR(close(i->second));
   }
 
   allocated_dibs_.clear();
 }
 #endif