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

chrome/browser/renderer_host/render_view_host.h

 // 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.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 128 matching lines @@
   // for a cross-site navigation, because we must suspend any navigations until
   // we hear back from the old renderer's onbeforeunload handler.  Note that it
   // is important that only one navigation event happen after calling this
   // method with |suspend| equal to true.  If |suspend| is false and there is
   // a suspended_nav_message_, this will send the message.  This function
   // should only be called to toggle the state; callers should check
   // are_navigations_suspended() first.
   void SetNavigationsSuspended(bool suspend);
 
   // Causes the renderer to invoke the onbeforeunload event handler.  The
-  // result will be returned via ViewMsg_ShouldClose.
+  // result will be returned via ViewMsg_ShouldClose. See also ClosePage which
+  // will fire the PageUnload event.
   void FirePageBeforeUnload();
 
-  // Close the page after the page has responded that it can be closed via
-  // ViewMsg_ShouldClose. This is where the page itself is closed. The
-  // unload handler is triggered here, which can block with a dialog, but cannot
-  // cancel the close of the page.
-  void FirePageUnload();
+  // Causes the renderer to close the current page, including running its
+  // onunload event handler.  A ClosePage_ACK message will be sent to the
+  // ResourceDispatcherHost when it is finished.
+  //
+  // Please see ViewMsg_ClosePage in resource_messages_internal.h for a
+  // description of the parameters.
+  void ClosePage(bool for_cross_site_transition,
+                 int new_render_process_host_id,
+                 int new_request_id);
 
   // Close the page ignoring whether it has unload events registers.
   // This is called after the beforeunload and unload events have fired
   // and the user has agreed to continue with closing the page.
-  static void ClosePageIgnoringUnloadEvents(int render_process_host_id,
-                                            int request_id);
-
-  // Causes the renderer to close the current page, including running its
-  // onunload event handler.  A ClosePage_ACK message will be sent to the
-  // ResourceDispatcherHost when it is finished. |new_render_process_host_id|
-  // and |new_request_id| will help the ResourceDispatcherHost identify which
-  // response is associated with this event.
-  void ClosePage(int new_render_process_host_id, int new_request_id);
+  void ClosePageIgnoringUnloadEvents();
 
   // Sets whether this RenderViewHost has an outstanding cross-site request,
   // for which another renderer will need to run an onunload event handler.
   // This is called before the first navigation event for this RenderViewHost,
   // and again after the corresponding OnCrossSiteResponse.
   void SetHasPendingCrossSiteRequest(bool has_pending_request, int request_id);
 
   // Returns the request_id for the pending cross-site request.
   // This is just needed in case the unload of the current page
   // hangs, in which case we need to swap to the pending RenderViewHost.
@@ skipping 447 matching lines @@
   // While in this mode, mouse click is converted into InspectElement
   // command.
   bool in_inspect_element_mode_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHost);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_