Separate RenderViewHost from RenderWidgetHost, part 10: shutdown.

content/browser/renderer_host/render_widget_host_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 177 matching lines @@
 
   // Signal whether this RenderWidgetHost is owned by a RenderFrameHost, in
   // which case it does not do self-deletion.
   void set_owned_by_render_frame_host(bool owned_by_rfh) {
     owned_by_render_frame_host_ = owned_by_rfh;
   }
   bool owned_by_render_frame_host() const {
     return owned_by_render_frame_host_;
   }
 
-  // Tells the renderer to die and then calls Destroy().
-  virtual void Shutdown();
+  // Tells the renderer to die and optionally call Destroy().
+  void ShutdownWidget(bool destroy);
 
   // IPC::Listener
   bool OnMessageReceived(const IPC::Message& msg) override;
 
   // Sends a message to the corresponding object in the renderer.
   bool Send(IPC::Message* msg) override;
 
   // Indicates if the page has finished loading.
   void SetIsLoading(bool is_loading);
 
@@ skipping 305 matching lines @@
 
   // ---------------------------------------------------------------------------
 
   bool IsMouseLocked() const;
 
   // The View associated with the RenderViewHost. The lifetime of this object
   // is associated with the lifetime of the Render process. If the Renderer
   // crashes, its View is destroyed and this pointer becomes NULL, even though
   // render_view_host_ lives on to load another URL (creating a new View while
   // doing so).
-  RenderWidgetHostViewBase* view_;
-
-  // A weak pointer to the view. The above pointer should be weak, but changing
-  // that to be weak causes crashes on Android.
-  // TODO(ccameron): Fix this.
-  // http://crbug.com/404828
-  base::WeakPtr<RenderWidgetHostViewBase> view_weak_;
+  base::WeakPtr<RenderWidgetHostViewBase> view_;

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

My understanding was that the RWH owns the RWHV, so the fact that there's a
weak_ptr here is kind of suspect to me (maybe I had things wrong, or maybe
there's weird platformy differences here that make ownership ambiguous).

Generally speaking I don't think you should keep a weak_ptr to something you
own, since it shouldn't disappear without your say-so.

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

The RWHV owns the RWHI. Note that they (being RenderWidgetHostViewAura/Mac) call
Shutdown on it. This was in the days before we started using scoped_ptr to
indicate ownership, but yeah, the ownership model here is very very very very
wack.

 
  private:
   friend class MockRenderWidgetHost;
 
   // Tell this object to destroy itself.
   void Destroy();
 
   // Called by |hang_monitor_timeout_| on delayed response from the renderer.
   void RendererIsUnresponsive();
 
@@ skipping 279 matching lines @@
   scoped_ptr<base::ElapsedTimer> mouse_wheel_coalesce_timer_;
 
   base::WeakPtrFactory<RenderWidgetHostImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_