Refactor sudden termination

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index ff003ddb3c808f2ecd7ce45abb86207620d9d2bd..a4b3a4c6e773520cc0945810b12d3656512cbd9d 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1101,8 +1101,8 @@ bool WebContentsImpl::NeedToFireBeforeUnload() {
   // TODO(creis): Should we fire even for interstitial pages?
   return WillNotifyDisconnection() &&
       !ShowingInterstitialPage() &&
-      !static_cast<RenderViewHostImpl*>(
-          GetRenderViewHost())->SuddenTerminationAllowed();
+      !static_cast<RenderFrameHostImpl*>(
+          GetMainFrame())->SuddenTerminationAllowed();

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

This doesn't seem quite right to me.  What if the main frame doesn't have a
beforeunload handler but a subframe does?

I know we didn't handle all subframe cases correctly in the past, but I think
that simple case worked (since the subframe's beforeunload handler was tracked
on RVH).  It seems like we should be checking all frames here (using
ForEachFrame), and probably the process as well.

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

RenderFrameHostImpl::DispatchBeforeUnload skips executing the BeforeUnload event
for subframes (though there is a TODO there saying that we should). That said,
since this function is actually checking for more than BeforeUnload, I now check
all RFH in the FrameTree.

 }
 
 void WebContentsImpl::DispatchBeforeUnload(bool for_cross_site_transition) {
@@ -4035,7 +4035,7 @@ void WebContentsImpl::RendererUnresponsive(RenderViewHost* render_view_host) {
       rfhi->IsWaitingForUnloadACK()) {
     // Hang occurred while firing the beforeunload/unload handler.
     // Pretend the handler fired so tab closing continues as if it had.
-    rvhi->set_sudden_termination_allowed(true);
+    rfhi->set_override_sudden_termination_status(true);

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

Again, this is only the main frame.  We'll eventually need to move this method
to work with RenderFrameHosts, but for now we should probably notify all RFHs
corresponding to render_view_host.

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

Done.

 
     if (!GetRenderManager()->ShouldCloseTabOnUnresponsiveRenderer())
       return;