Fix a race condition where rapid back/forward clicks could close a tab...

chrome/browser/renderer_host/render_widget_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_RENDEDER_HOST_RENDER_WIDGET_HELPER_H_
 #define CHROME_BROWSER_RENDEDER_HOST_RENDER_WIDGET_HELPER_H_
 
 #include <map>
 
 #include "base/atomic_sequence_num.h"
 #include "base/hash_tables.h"
 #include "base/process.h"
 #include "base/ref_counted.h"
 #include "base/lock.h"
 #include "base/waitable_event.h"
 #include "chrome/common/modal_dialog_event.h"
 #include "chrome/common/transport_dib.h"
 
 namespace IPC {
 class Message;
 }
 
 namespace base {
 class TimeDelta;
 }
 
 class MessageLoop;
 class ResourceDispatcherHost;
+struct ViewMsg_ClosePage_Params;
 
 // Instantiated per RenderProcessHost to provide various optimizations on
 // behalf of a RenderWidgetHost.  This class bridges between the IO thread
 // where the RenderProcessHost's MessageFilter lives and the UI thread where
 // the RenderWidgetHost lives.
 //
 //
 // OPTIMIZED RESIZE
 //
 //   RenderWidgetHelper is used to implement optimized resize.  When the
@@ skipping 58 matching lines @@
   // Gets the next available routing id.  This is thread safe.
   int GetNextRoutingID();
 
 
   // UI THREAD ONLY -----------------------------------------------------------
 
   // These three functions provide the backend implementation of the
   // corresponding functions in RenderProcessHost. See those declarations
   // for documentation.
   void CancelResourceRequests(int render_widget_id);
-  void CrossSiteClosePageACK(int new_render_process_host_id,
-                             int new_request_id);
+  void CrossSiteClosePageACK(const ViewMsg_ClosePage_Params& params);
   bool WaitForPaintMsg(int render_widget_id,
                        const base::TimeDelta& max_delay,
                        IPC::Message* msg);
 
 #if defined(OS_MACOSX)
   // Given the id of a transport DIB, return a mapping to it or NULL on error.
   TransportDIB* MapTransportDIB(TransportDIB::Id dib_id);
 #endif
 
 
@@ skipping 48 matching lines @@
   // Called on the IO thread after a window was created on the UI thread.
   void OnCreateWindowOnIO(int route_id);
 
   // Called on the UI thread to finish creating a widget.
   void OnCreateWidgetOnUI(int opener_id, int route_id, bool activatable);
 
   // Called on the IO thread to cancel resource requests for the render widget.
   void OnCancelResourceRequests(int render_widget_id);
 
   // Called on the IO thread to resume a cross-site response.
-  void OnCrossSiteClosePageACK(int new_render_process_host_id,
-                               int new_request_id);
+  void OnCrossSiteClosePageACK(ViewMsg_ClosePage_Params params);
 
 #if defined(OS_MACOSX)
   // Called on destruction to release all allocated transport DIBs
   void ClearAllocatedDIBs();
 
   // On OSX we keep file descriptors to all the allocated DIBs around until
   // the renderer frees them.
   Lock allocated_dibs_lock_;
   std::map<TransportDIB::Id, int> allocated_dibs_;
 #endif
@@ skipping 15 matching lines @@
 
   // The next routing id to use.
   base::AtomicSequenceNumber next_routing_id_;
 
   ResourceDispatcherHost* resource_dispatcher_host_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHelper);
 };
 
 #endif  // CHROME_BROWSER_RENDEDER_HOST_RENDER_WIDGET_HELPER_H_