Separate RenderViewHost from RenderWidgetHost, part 10: shutdown.

content/browser/renderer_host/render_widget_host_view_mac.mm

Index: content/browser/renderer_host/render_widget_host_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 278fa99ce7b410524fe7104bff357f364682d4b5..8e5e1063b651befc767c6f37f11227a15e47cc83 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -1055,23 +1055,6 @@ void RenderWidgetHostViewMac::RenderProcessGone(base::TerminationStatus status,
   Destroy();
 }
 
-void RenderWidgetHostViewMac::RenderWidgetHostGone() {
-  // Clear SurfaceID namespace ownership before we shutdown the
-  // compositor.
-  if (UseSurfacesEnabled() && render_widget_host_ &&
-      render_widget_host_->delegate() &&
-      render_widget_host_->delegate()->GetInputEventRouter()) {
-    render_widget_host_->delegate()
-        ->GetInputEventRouter()
-        ->RemoveSurfaceIdNamespaceOwner(GetSurfaceIdNamespace());
-  }
-
-  // Destroy the DelegatedFrameHost, to prevent crashes when Destroy is never
-  // called on the view.
-  // http://crbug.com/404828
-  ShutdownBrowserCompositor();
-}
-
 void RenderWidgetHostViewMac::Destroy() {
   [[NSNotificationCenter defaultCenter]
       removeObserver:cocoa_view_
@@ -1628,7 +1611,7 @@ bool RenderWidgetHostViewMac::Send(IPC::Message* message) {
 
 void RenderWidgetHostViewMac::ShutdownHost() {
   weak_factory_.InvalidateWeakPtrs();
-  render_widget_host_->Shutdown();
+  render_widget_host_->ShutdownWidget(true);

[ncarter (slow), 2015/11/17 22:22:55]

So what's happening here:

1. RWHV tells the widget to delete itself (and thus the RWHV)
2. widget requests that its owner delegate delete widget
3. owner delegate (RVH) deletes the widget
4. widget dtor is supposed to deletes the attached RWHV

Step 4 used to work because it kept a nonweak ptr. But the weak_factory_, above,
was already invalidated, so it's not clear to me how the RWH would delete the
RWHV?

So, it kind of looks like we're leaking the RWHV here.

[Avi (use Gerrit), 2015/11/18 00:29:59]

Lemme work on wrapping my brain around this.

   // Do not touch any members at this point, |this| has been deleted.
 }
 
@@ -2096,7 +2079,7 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
         renderWidgetHostView_->fullscreen_parent_host_view();
     if (parent)
       parent->cocoa_view()->suppressNextEscapeKeyUp_ = YES;
-    widgetHost->Shutdown();
+    widgetHost->ShutdownWidget(true);
     return;
   }