Refactor sudden termination

content/browser/renderer_host/render_view_host_impl.cc

Index: content/browser/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 2be0fc0877e8dc3c3de566d90418b998ee416749..455b0f8285f80c319a343e8f6287ef72987557b3 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -125,6 +125,19 @@ void DismissVirtualKeyboardTask() {
 }
 #endif
 
+// Enable sudden termination for the current RenderFrameHost of
+// |frame_tree_node| if the ID of its SiteInstance is |site_instance_id|.  Used
+// with FrameTree::ForEach.
+bool EnableSuddenTermination(int32 site_instance_id,
+                             FrameTreeNode* frame_tree_node) {
+  if (frame_tree_node->current_frame_host()->GetSiteInstance()->GetId()
+      == site_instance_id) {
+    frame_tree_node->current_frame_host()
+        ->set_override_sudden_termination_status(true);
+  }
+  return true;
+}
+
 }  // namespace
 
 // static
@@ -183,7 +196,6 @@ RenderViewHostImpl::RenderViewHostImpl(
       run_modal_reply_msg_(NULL),
       run_modal_opener_id_(MSG_ROUTING_NONE),
       is_waiting_for_close_ack_(false),
-      sudden_termination_allowed_(false),
       render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING),
       virtual_keyboard_requested_(false),
       is_focused_element_editable_(false),
@@ -555,7 +567,10 @@ void RenderViewHostImpl::ClosePageIgnoringUnloadEvents() {
   StopHangMonitorTimeout();
   is_waiting_for_close_ack_ = false;
 
-  sudden_termination_allowed_ = true;
+  // Enable sudden termination for all RenderFrameHosts in the FrameTree.
+  FrameTree* frame_tree = static_cast<RenderFrameHostImpl*>(GetMainFrame())

[Charlie Reis, 2015/02/04 21:34:58]

nit: I think we can skip this cast as well by making
RenderViewHostImpl::GetMainFrame return a RenderFrameHostImpl.  (Just use
RenderFrameHostImpl::FromID in the body instead of RenderFrameHost::FromID.)

[clamy, 2015/02/05 16:23:13]

It is not possible because to have GetMainFrame return a RenderFrameHostImpl and
still be recognized a proper override a forward declaration of
RenderFrameHostImpl is not enough, and the header for RenderFrameHostImpl has to
be included in RenderViewHostImpl header file. This is explicitly against one of
the DEPS rule of content/browser/renderer_host/.

[Charlie Reis, 2015/02/05 17:12:17]

Acknowledged.

+      ->frame_tree_node()->frame_tree();
+  frame_tree->ForEach(base::Bind(&EnableSuddenTermination, instance_->GetId()));
   delegate_->Close(this);
 }
 
@@ -846,11 +861,6 @@ void RenderViewHostImpl::LoadStateChanged(
   delegate_->LoadStateChanged(url, load_state, upload_position, upload_size);
 }
 
-bool RenderViewHostImpl::SuddenTerminationAllowed() const {
-  return sudden_termination_allowed_ ||
-      GetProcess()->SuddenTerminationAllowed();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // RenderViewHostImpl, IPC message handlers: