Refactor sudden termination

content/browser/frame_host/render_frame_host_impl.h

 // Copyright 2013 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 CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 247 matching lines @@
 
   // Whether an ongoing navigation is waiting for a BeforeUnload ACK from the
   // RenderFrame. Currently this only happens in cross-site navigations.
   // PlzNavigate: this happens in every browser-initiated navigation that is not
   // same-page.
   bool IsWaitingForBeforeUnloadACK() const;
 
   // Whether the RFH is waiting for an unload ACK from the renderer.
   bool IsWaitingForUnloadACK() const;
 
+  // Whether sudden termination is allowed for this frame. This is true if there
+  // are no BeforeUnload handlers or no Unload handlers registered for the
+  // frame, or it was overriden by the browser to be always true.
+  bool SuddenTerminationAllowed() const;
+
+  // Called by the browser to override (or not) the sudden termination status of
+  // the frame. When overriden, sudden termination is always allowed, even if
+  // would otherwise be prevented.

[Charlie Reis, 2015/01/29 23:20:41]

nit: it would

[clamy, 2015/02/02 16:16:27]

Done.

+  void set_override_sudden_termination_status(bool enabled) {
+    override_sudden_termination_status_ = enabled;
+  }
+
   // Called when either the SwapOut request has been acknowledged or has timed
   // out.
   void OnSwappedOut();
 
   // Whether this RenderFrameHost has been swapped out, such that the frame is
   // now rendered by a RenderFrameHost in a different process.
   bool is_swapped_out() const { return rfh_state_ == STATE_SWAPPED_OUT; }
 
   // The current state of this RFH.
   RenderFrameHostImplState rfh_state() const { return rfh_state_; }
@@ skipping 197 matching lines @@
   void OnBeginNavigation(const FrameHostMsg_BeginNavigation_Params& params,
                          const CommonNavigationParams& common_params);
   void OnAccessibilityEvents(
       const std::vector<AccessibilityHostMsg_EventParams>& params,
       int reset_token);
   void OnAccessibilityLocationChanges(
       const std::vector<AccessibilityHostMsg_LocationChangeParams>& params);
   void OnAccessibilityFindInPageResult(
       const AccessibilityHostMsg_FindInPageResultParams& params);
   void OnToggleFullscreen(bool enter_fullscreen);
+  void OnBeforeUnloadHandlersPresent(bool present);
+  void OnUnloadHandlersPresent(bool present);
 
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
   void OnShowPopup(const FrameHostMsg_ShowPopup_Params& params);
   void OnHidePopup();
 #endif
 
   // Registers Mojo services that this frame host makes available.
   void RegisterMojoServices();
 
   // Updates the state of this RenderFrameHost and clears any waiting state
@@ skipping 18 matching lines @@
       const std::map<int32, int>& node_to_browser_plugin_instance_id_map);
 
   // Asserts that the given RenderFrameHostImpl is part of the same browser
   // context (and crashes if not), then returns whether the given frame is
   // part of the same site instance.
   bool IsSameSiteInstance(RenderFrameHostImpl* other_render_frame_host);
 
   // Informs the content client that geolocation permissions were used.
   void DidUseGeolocationPermission();
 
+  // Handle a change in presence for one of the sudden termination disablers.
+  // Signals the RenderProcessHost if the sudden termination status for this
+  // frame changes.
+  void HandleSuddenTerminationDisablerPresenceChange(bool* disabler_presence,

[Charlie Reis, 2015/01/29 23:20:41]

Don't forget to remove this, now that the implementation is gone.  :)

[clamy, 2015/02/02 16:16:27]

Done.

+                                                     bool new_value);
+
   // For now, RenderFrameHosts indirectly keep RenderViewHosts alive via a
   // refcount that calls Shutdown when it reaches zero.  This allows each
   // RenderFrameHostManager to just care about RenderFrameHosts, while ensuring
   // we have a RenderViewHost for each RenderFrameHost.
   // TODO(creis): RenderViewHost will eventually go away and be replaced with
   // some form of page context.
   RenderViewHostImpl* render_view_host_;
 
   RenderFrameHostDelegate* delegate_;
 
@@ skipping 54 matching lines @@
   // We only buffer the params for a suspended navigation while this RFH is the
   // pending RenderFrameHost of a RenderFrameHostManager. There will only ever
   // be one suspended navigation, because RenderFrameHostManager will destroy
   // the pending RenderFrameHost and create a new one if a second navigation
   // occurs.
   scoped_ptr<FrameMsg_Navigate_Params> suspended_nav_params_;
 
   // When the last BeforeUnload message was sent.
   base::TimeTicks send_before_unload_start_time_;
 
+  // Used to track whether sudden termination is allowed for this frame.
+  // has_beforeunload_handlers_ and has_unload_handlers_ are also used to avoid
+  // asking the renderer process to run BeforeUnload or Unload during
+  // navigation. The browser can set override_sudden_termination_status_ to
+  // true, in which case sudden termination will be allowed. This is used when a
+  // renderer executing BeforeUnload or Unload is unresponsive. All other values
+  // are modified based on IPCs received from the renderer.
+  bool has_beforeunload_handlers_;
+  bool has_unload_handlers_;
+  bool override_sudden_termination_status_;
+
   // Set to true when there is a pending FrameMsg_ShouldClose message.  This
   // ensures we don't spam the renderer with multiple beforeunload requests.
   // When either this value or IsWaitingForUnloadACK is true, the value of
   // unload_ack_is_for_cross_site_transition_ indicates whether this is for a
   // cross-site transition or a tab close attempt.
   // TODO(clamy): Remove this boolean and add one more state to the state
   // machine.
   bool is_waiting_for_beforeunload_ack_;
 
   // Valid only when is_waiting_for_beforeunload_ack_ or
@@ skipping 42 matching lines @@
 
   // NOTE: This must be the last member.
   base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_