DispatcherHost owns API objects and deletion

rogerwang · rogerwang · commit 6dbaafb1d314 · 2014-02-21T13:44:24.000+08:00
The Window object should be deleted on browser side when DispatcherHost is removed (e.g. dev reload), which will then trigger decoupling with shell, or it cannot be closed. Fix nwjs#1330
diff --git a/src/api/dispatcher_host.cc b/src/api/dispatcher_host.cc
@@ -57,6 +57,12 @@ DispatcherHost::DispatcherHost(content::RenderViewHost* render_view_host)
 
 DispatcherHost::~DispatcherHost() {
   g_dispatcher_host_map.erase(render_view_host());
+  std::set<int>::iterator it;
+  for (it = objects_.begin(); it != objects_.end(); it++) {
+    if (Base* obj = GetApiObject(*it)) {
+      delete obj;
+    }
+  }
 }
 
 DispatcherHost*
@@ -138,11 +144,14 @@ void DispatcherHost::OnAllocateObject(int object_id,
     LOG(ERROR) << "Allocate an object of unknown type: " << type;
     objects_registry_.AddWithID(new Base(object_id, weak_ptr_factory_.GetWeakPtr(), option), object_id);
   }
+  objects_.insert(object_id);
 }
 
 void DispatcherHost::OnDeallocateObject(int object_id) {
   DLOG(INFO) << "OnDeallocateObject: object_id:" << object_id;
-  objects_registry_.Remove(object_id);
+  if (objects_registry_.Lookup(object_id))
+    objects_registry_.Remove(object_id);
+  objects_.erase(object_id);
 }
 
 void DispatcherHost::OnCallObjectMethod(
diff --git a/src/api/dispatcher_host.h b/src/api/dispatcher_host.h
@@ -27,6 +27,7 @@
 #include "content/public/browser/render_view_host_observer.h"
 
 #include <string>
+#include <set>
 
 namespace base {
 class DictionaryValue;
@@ -78,6 +79,8 @@ class DispatcherHost : public content::RenderViewHostObserver {
   static IDMap<Base, IDMapOwnPointer> objects_registry_;
   static int next_object_id_;
 
+  std::set<int> objects_;
+
   // Factory to generate weak pointer
   base::WeakPtrFactory<DispatcherHost> weak_ptr_factory_;
 

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,12 @@ DispatcherHost::DispatcherHost(content::RenderViewHost* render_view_host)`
`57`	`57`
`58`	`58`	`DispatcherHost::~DispatcherHost() {`
`59`	`59`	`g_dispatcher_host_map.erase(render_view_host());`
	`60`	`+ std::set<int>::iterator it;`
	`61`	`+ for (it = objects_.begin(); it != objects_.end(); it++) {`
	`62`	`+ if (Base* obj = GetApiObject(*it)) {`
	`63`	`+ delete obj;`
	`64`	`+ }`
	`65`	`+ }`
`60`	`66`	`}`
`61`	`67`
`62`	`68`	`DispatcherHost*`
`@@ -138,11 +144,14 @@ void DispatcherHost::OnAllocateObject(int object_id,`
`138`	`144`	`LOG(ERROR) << "Allocate an object of unknown type: " << type;`
`139`	`145`	`objects_registry_.AddWithID(new Base(object_id, weak_ptr_factory_.GetWeakPtr(), option), object_id);`
`140`	`146`	`}`
	`147`	`+ objects_.insert(object_id);`
`141`	`148`	`}`
`142`	`149`
`143`	`150`	`void DispatcherHost::OnDeallocateObject(int object_id) {`
`144`	`151`	`DLOG(INFO) << "OnDeallocateObject: object_id:" << object_id;`
`145`		`- objects_registry_.Remove(object_id);`
	`152`	`+ if (objects_registry_.Lookup(object_id))`
	`153`	`+ objects_registry_.Remove(object_id);`
	`154`	`+ objects_.erase(object_id);`
`146`	`155`	`}`
`147`	`156`
`148`	`157`	`void DispatcherHost::OnCallObjectMethod(`