Merge 21685 - Relanding r21673 without reenabling the BrowserTest, which appa...

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 131 matching lines @@
   // 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. See also ClosePage which
   // will fire the PageUnload event.
-  void FirePageBeforeUnload();
+  //
+  // Set bool for_cross_site_transition when this close is just for the current
+  // RenderView in the case of a cross-site transition. False means we're
+  // closing the entire tab.
+  void FirePageBeforeUnload(bool for_cross_site_transition);
 
   // 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);
@@ skipping 447 matching lines @@
   // We only buffer a suspended navigation message while we a pending RVH for a
   // TabContents.  There will only ever be one suspended navigation, because
   // TabContents will destroy the pending RVH and create a new one if a second
   // navigation occurs.
   scoped_ptr<ViewMsg_Navigate> suspended_nav_message_;
 
   // If we were asked to RunModal, then this will hold the reply_msg that we
   // must return to the renderer to unblock it.
   IPC::Message* run_modal_reply_msg_;
 
+  // Set to true when there is a pending ViewMsg_ShouldClose message pending.
+  // This ensures we don't spam the renderer many times to close. When true,
+  // the value of unload_ack_is_for_cross_site_transition_ indicates which type
+  // of unload this is for.
   bool is_waiting_for_unload_ack_;
 
+  // Valid only when is_waiting_for_unload_ack_ is true, this tells us if the
+  // unload request is for closing the entire tab ( = false), or only this
+  // RenderViewHost in the case of a cross-site transition ( = true).
+  bool unload_ack_is_for_cross_site_transition_;
+
   bool are_javascript_messages_suppressed_;
 
   // True if the render view can be shut down suddenly.
   bool sudden_termination_allowed_;
 
   // DevTools triggers this mode when user chooses inspect lens tool.
   // 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_