Refactor sudden termination

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 1083 matching lines @@
   for (RenderWidgetHostView* view : GetRenderWidgetHostViewsInTree()) {
     if (view)
       view->WasUnOccluded();
   }
 }
 
 bool WebContentsImpl::NeedToFireBeforeUnload() {
   // TODO(creis): Should we fire even for interstitial pages?
   return WillNotifyDisconnection() &&
       !ShowingInterstitialPage() &&
-      !static_cast<RenderViewHostImpl*>(
-          GetRenderViewHost())->SuddenTerminationAllowed();
+      !static_cast<RenderFrameHostImpl*>(

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

We shouldn't need this cast.  Just return RenderFrameHostImpl from
WebContentsImpl::GetMainFrame (will work with covariant return types).

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

WebContentsImpl::GetMainFrame returns a RenderFrameHost and is an implementation
of WebContents::GetMainFrame which is part of the public content API. I don't
think I can modify it to return a RenderFrameHostImpl (or am I not understanding
this comment?).

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

You can make WebContentsImpl::GetMainFrame return RenderFrameHostImpl.  That
still matches the contract from WebContents::GetMainFrame, because all
RenderFrameHostImpls are RenderFrameHosts.  See
WebContentsImpl::GetSiteInstance() for a similar example.

+          GetMainFrame())->SuddenTerminationAllowed();
 }
 
 void WebContentsImpl::DispatchBeforeUnload(bool for_cross_site_transition) {
   static_cast<RenderFrameHostImpl*>(GetMainFrame())->DispatchBeforeUnload(
       for_cross_site_transition);
 }
 
 void WebContentsImpl::Stop() {
   GetRenderManager()->Stop();
   FOR_EACH_OBSERVER(WebContentsObserver, observers_, NavigationStopped());
@@ skipping 2902 matching lines @@
   // Ignore renderer unresponsive event if debugger is attached to the tab
   // since the event may be a result of the renderer sitting on a breakpoint.
   // See http://crbug.com/65458
   if (DevToolsAgentHost::IsDebuggerAttached(this))
     return;
 
   if (rfhi->is_waiting_for_beforeunload_ack() ||
       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);
 
     if (!GetRenderManager()->ShouldCloseTabOnUnresponsiveRenderer())
       return;
 
     // If the tab hangs in the beforeunload/unload handler there's really
     // nothing we can do to recover. If the hang is in the beforeunload handler,
     // pretend the beforeunload listeners have all fired and allow the delegate
     // to continue closing; the user will not have the option of cancelling the
     // close. Otherwise, pretend the unload listeners have all fired and close
     // the tab.
@@ skipping 401 matching lines @@
   node->render_manager()->ResumeResponseDeferredAtStart();
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content