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 234 matching lines @@
   // active RenderFrames, but not until WasSwappedOut is called.
   void SwapOut(RenderFrameProxyHost* proxy, bool is_loading);
 
   bool is_waiting_for_beforeunload_ack() const {
     return is_waiting_for_beforeunload_ack_;
   }
 
   // Whether the RFH is waiting for an unload ACK from the renderer.
   bool IsWaitingForUnloadACK() const;
 
+  // Whether sudden termination is allowed for this frame.

[Charlie Reis, 2015/01/23 06:01:32]

Briefly mention what conditions determine this.

[clamy, 2015/01/26 16:38:40]

Done.

+  bool SuddenTerminationAllowed() const;
+
+  // Called by the browser to override or not the sudden termination status of

[Charlie Reis, 2015/01/23 06:01:32]

nit: (or not)

[clamy, 2015/01/26 16:38:39]

Done.

+  // the frame. When overriden, sudden termination is always allowed, even if
+  // some disablers are present for the frame.

[Charlie Reis, 2015/01/23 06:01:32]

"disablers" isn't a well-defined term in the code.  Maybe:

even if it would otherwise be prevented.

[clamy, 2015/01/26 16:38:39]

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 196 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 OnBeforeUnloadHandlersPresenceChanged(bool present);
+  void OnUnloadHandlersPresenceChanged(bool present);

[Charlie Reis, 2015/01/23 06:01:32]

These names are a bit unwieldy.  Would On{Before}UnloadHandlersPresent(bool
present) work?  Same for FrameHostMsg_{Before}UnloadHandlersPresent.

[clamy, 2015/01/26 16:38:40]

Done.

 
 #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,
+                                                     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 99 matching lines @@
   // already exists it will still be used.
   bool no_create_browser_accessibility_manager_for_testing_;
 
   // PlzNavigate: Owns the stream used in navigations to store the body of the
   // response once it has started.
   scoped_ptr<StreamHandle> stream_handle_;
 
   // Context shared for each PermissionService instance created for this RFH.
   scoped_ptr<PermissionServiceContext> permission_service_context_;
 
+  // Used to track whether sudden termination is allowed for this frame.
+  // has_beforeunload_handlers_ and has_unload_handlers_ are also used to skip
+  // waiting for the execution of BeforeUnload and Unload if they are false. The

[Charlie Reis, 2015/01/23 06:01:32]

...to avoid asking the renderer process to run BeforeUnload or Unload during
navigation.

[clamy, 2015/01/26 16:38:39]

Done.

+  // 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_;

[Charlie Reis, 2015/01/23 06:01:32]

nit: Please put these near the other *unload members (around 607).

[clamy, 2015/01/26 16:38:40]

Done.

+  bool has_unload_handlers_;
+  bool override_sudden_termination_status_;
+
   // 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_