Delete DispatcherHost when RVH deleted

Cong Liu · Cong Liu · commit 70f52a16d6fc · 2015-05-05T16:33:05.000+08:00
diff --git a/src/api/dispatcher_host.cc b/src/api/dispatcher_host.cc
@@ -62,6 +62,7 @@ DispatcherHost::DispatcherHost(content::RenderViewHost* host)
 
 DispatcherHost::~DispatcherHost() {
   g_dispatcher_host_map.erase(render_view_host());
+  render_view_host_ = NULL;
   std::set<int>::iterator it;
   for (it = objects_.begin(); it != objects_.end(); it++) {
     if (objects_registry_.Lookup(*it))
@@ -139,6 +140,15 @@ void DispatcherHost::RenderViewHostChanged(content::RenderViewHost* old_host,
     delete this;
 }
 
+void DispatcherHost::RenderViewDeleted(content::RenderViewHost* host) {
+  if (render_view_host_ == host)
+    delete this;
+}
+
+void DispatcherHost::RenderProcessGone(base::TerminationStatus status) {
+  delete this;
+}
+
 void DispatcherHost::OnAllocateObject(int object_id,
                                       const std::string& type,
                                       const base::DictionaryValue& option) {
diff --git a/src/api/dispatcher_host.h b/src/api/dispatcher_host.h
@@ -72,6 +72,8 @@ class DispatcherHost : public content::WebContentsObserver {
   virtual bool Send(IPC::Message* message) OVERRIDE;
   virtual void RenderViewHostChanged(content::RenderViewHost* old_host,
                                      content::RenderViewHost* new_host) OVERRIDE;
+  virtual void RenderViewDeleted(content::RenderViewHost* host) OVERRIDE;
+  virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
   content::RenderViewHost* render_view_host() const {
     return render_view_host_;
   }

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@ class DispatcherHost : public content::WebContentsObserver {`
`72`	`72`	`virtual bool Send(IPC::Message* message) OVERRIDE;`
`73`	`73`	`virtual void RenderViewHostChanged(content::RenderViewHost* old_host,`
`74`	`74`	`content::RenderViewHost* new_host) OVERRIDE;`
	`75`	`+ virtual void RenderViewDeleted(content::RenderViewHost* host) OVERRIDE;`
	`76`	`+ virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;`
`75`	`77`	`content::RenderViewHost* render_view_host() const {`
`76`	`78`	`return render_view_host_;`
`77`	`79`	`}`