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/lazy_instance.h"
@@ skipping 184 matching lines @@
                                    ->render_manager()
                                    ->GetRenderWidgetHostView();
   set->insert(rwhv);
 }
 
 void SetAccessibilityModeOnFrame(AccessibilityMode mode,
                                  RenderFrameHost* frame_host) {
   static_cast<RenderFrameHostImpl*>(frame_host)->SetAccessibilityMode(mode);
 }
 
+// Enable sudden termination for the current RenderFrameHost of
+// |frame_tree_node| if its RenderViewHost is |render_view_host|.
+// Used with FrameTree::ForEach.
+bool EnableSuddenTermination(RenderViewHost* render_view_host,

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

Another possibility would be to provide two functions in FrameTree, 1 to enable
sudden termination for all frames associated with render_view_host, and one to
check if sudden termiation is allowed for all frames associated with
render_view_host. That would hide the ForEach call down below and in
RenderViewHost.

[Charlie Reis, 2015/02/02 20:14:50]

What you have is fine.  We probably shouldn't add sudden termination knowledge
to FrameTree.

[clamy, 2015/02/03 12:54:02]

Acknowledged (that's why I did not do it in the first place).

+                             FrameTreeNode* frame_tree_node) {
+  if (frame_tree_node->current_frame_host()->render_view_host()
+      == render_view_host) {

[Charlie Reis, 2015/02/02 20:14:50]

Let's pass in the SiteInstance rather than the RVH.  That's equivalent and
avoids adding a new dependency on RVH.

[clamy, 2015/02/03 12:54:03]

Done.

+    frame_tree_node->current_frame_host()
+        ->set_override_sudden_termination_status(true);
+  }
+  return true;
+}
+
+// Returns false and sets |sudden_termination_allowed| to false if sudden
+// termination is not allowed for the current RenderFrameHost of
+// |frame_tree_node| (if its RenderViewHost is |render_view_host|). Used with
+// FrameTree::ForEach.
+bool SuddenTerminationAllowed(bool* sudden_termination_allowed,
+                              RenderViewHost* render_view_host,

[Charlie Reis, 2015/02/02 20:14:50]

Same: Use SiteInstance here.

[clamy, 2015/02/03 12:54:03]

Done.

+                              FrameTreeNode* frame_tree_node) {
+  if (frame_tree_node->current_frame_host()->SuddenTerminationAllowed() ||
+      frame_tree_node->current_frame_host()->render_view_host()
+      != render_view_host) {
+    return true;
+  }
+  *sudden_termination_allowed = false;
+  return false;
+}
+
 }  // namespace
 
 WebContents* WebContents::Create(const WebContents::CreateParams& params) {
   return WebContentsImpl::CreateWithOpener(
       params, static_cast<WebContentsImpl*>(params.opener));
 }
 
 WebContents* WebContents::CreateWithSessionStorage(
     const WebContents::CreateParams& params,
     const SessionStorageNamespaceMap& session_storage_namespace_map) {
@@ skipping 419 matching lines @@
     if (view_)
       view_->SetOverscrollControllerEnabled(CanOverscrollContent());
   }
 }
 
 RenderProcessHost* WebContentsImpl::GetRenderProcessHost() const {
   RenderViewHostImpl* host = GetRenderManager()->current_host();
   return host ? host->GetProcess() : NULL;
 }
 
-RenderFrameHost* WebContentsImpl::GetMainFrame() {
+RenderFrameHostImpl* WebContentsImpl::GetMainFrame() {
   return frame_tree_.root()->current_frame_host();
 }
 
 RenderFrameHost* WebContentsImpl::GetFocusedFrame() {
   if (!frame_tree_.GetFocusedFrame())
     return NULL;
   return frame_tree_.GetFocusedFrame()->current_frame_host();
 }
 
 void WebContentsImpl::ForEachFrame(
@@ skipping 120 matching lines @@
 }
 
 bool WebContentsImpl::IsFullAccessibilityModeForTesting() const {
   return accessibility_mode_ == AccessibilityModeComplete;
 }
 
 #if defined(OS_WIN)
 void WebContentsImpl::SetParentNativeViewAccessible(
 gfx::NativeViewAccessible accessible_parent) {
   accessible_parent_ = accessible_parent;
-  RenderFrameHostImpl* rfh = static_cast<RenderFrameHostImpl*>(GetMainFrame());
+  RenderFrameHostImpl* rfh = GetMainFrame();
   if (rfh)
     rfh->SetParentNativeViewAccessible(accessible_parent);
 }
 #endif
 
 const base::string16& WebContentsImpl::GetTitle() const {
   // Transient entries take precedence. They are used for interstitial pages
   // that are shown on top of existing pages.
   NavigationEntry* entry = controller_.GetTransientEntry();
   std::string accept_languages =
@@ skipping 308 matching lines @@
 }
 
 void WebContentsImpl::WasUnOccluded() {
   for (RenderWidgetHostView* view : GetRenderWidgetHostViewsInTree()) {
     if (view)
       view->WasUnOccluded();
   }
 }
 
 bool WebContentsImpl::NeedToFireBeforeUnload() {
+  bool sudden_termination_allowed = true;
+  frame_tree_.ForEach(base::Bind(&SuddenTerminationAllowed,
+                                 &sudden_termination_allowed,
+                                 GetRenderViewHost()));
   // TODO(creis): Should we fire even for interstitial pages?
   return WillNotifyDisconnection() &&
       !ShowingInterstitialPage() &&
-      !static_cast<RenderViewHostImpl*>(
-          GetRenderViewHost())->SuddenTerminationAllowed();
+      !sudden_termination_allowed;
 }
 
 void WebContentsImpl::DispatchBeforeUnload(bool for_cross_site_transition) {
-  static_cast<RenderFrameHostImpl*>(GetMainFrame())->DispatchBeforeUnload(
-      for_cross_site_transition);
+  GetMainFrame()->DispatchBeforeUnload(for_cross_site_transition);
 }
 
 void WebContentsImpl::Stop() {
   GetRenderManager()->Stop();
   FOR_EACH_OBSERVER(WebContentsObserver, observers_, NavigationStopped());
 }
 
 WebContents* WebContentsImpl::Clone() {
   // We use our current SiteInstance since the cloned entry will use it anyway.
   // We pass our own opener so that the cloned page can access it if it was
@@ skipping 213 matching lines @@
   // Notify the delegate if an embedded fullscreen widget was focused.
   if (delegate_ && render_widget_host &&
       delegate_->EmbedsFullscreenWidget() &&
       render_widget_host->GetView() == GetFullscreenRenderWidgetHostView())
     delegate_->WebContentsFocused(this);
 }
 
 void WebContentsImpl::RenderWidgetWasResized(
     RenderWidgetHostImpl* render_widget_host,
     bool width_changed) {
-  RenderFrameHostImpl* rfh = static_cast<RenderFrameHostImpl*>(GetMainFrame());
+  RenderFrameHostImpl* rfh = GetMainFrame();
   if (!rfh || render_widget_host != rfh->GetRenderWidgetHost())
     return;
 
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     MainFrameWasResized(width_changed));
 }
 
 bool WebContentsImpl::PreHandleKeyboardEvent(
     const NativeWebKeyboardEvent& event,
     bool* is_keyboard_shortcut) {
@@ skipping 436 matching lines @@
   if (BrowserPluginGuest::IsGuest(new_contents))
     return new_contents;
 
   if (!new_contents->GetRenderProcessHost()->HasConnection() ||
       !new_contents->GetRenderViewHost()->GetView())
     return NULL;
 
   // Resume blocked requests for both the RenderViewHost and RenderFrameHost.
   // TODO(brettw): It seems bogus to reach into here and initialize the host.
   static_cast<RenderViewHostImpl*>(new_contents->GetRenderViewHost())->Init();
-  static_cast<RenderFrameHostImpl*>(new_contents->GetMainFrame())->Init();
+  new_contents->GetMainFrame()->Init();
 
   return new_contents;
 }
 
 RenderWidgetHostView* WebContentsImpl::GetCreatedWidget(int route_id) {
   PendingWidgetViews::iterator iter = pending_widget_views_.find(route_id);
   if (iter == pending_widget_views_.end()) {
     DCHECK(false);
     return NULL;
   }
@@ skipping 96 matching lines @@
     delegate_->MoveValidationMessage(this, anchor_in_root_view);
 }
 
 void WebContentsImpl::DidSendScreenRects(RenderWidgetHostImpl* rwh) {
   if (browser_plugin_embedder_)
     browser_plugin_embedder_->DidSendScreenRects();
 }
 
 BrowserAccessibilityManager*
     WebContentsImpl::GetRootBrowserAccessibilityManager() {
-  RenderFrameHostImpl* rfh = static_cast<RenderFrameHostImpl*>(GetMainFrame());
+  RenderFrameHostImpl* rfh = GetMainFrame();
   return rfh ? rfh->browser_accessibility_manager() : NULL;
 }
 
 BrowserAccessibilityManager*
     WebContentsImpl::GetOrCreateRootBrowserAccessibilityManager() {
-  RenderFrameHostImpl* rfh = static_cast<RenderFrameHostImpl*>(GetMainFrame());
+  RenderFrameHostImpl* rfh = GetMainFrame();
   return rfh ? rfh->GetOrCreateBrowserAccessibilityManager() : NULL;
 }
 
 void WebContentsImpl::UpdatePreferredSize(const gfx::Size& pref_size) {
   const gfx::Size old_size = GetPreferredSize();
   preferred_size_ = pref_size;
   OnPreferredSizeChanged(old_size);
 }
 
 void WebContentsImpl::ResizeDueToAutoResize(const gfx::Size& new_size) {
@@ skipping 2107 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->IsWaitingForBeforeUnloadACK() ||
       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);
+    frame_tree_.ForEach(base::Bind(&EnableSuddenTermination, rvhi));
 
     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 407 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