Free window object on shell destruction

rogerwang · rogerwang · commit b875d0964d42 · 2013-12-05T19:50:48.000+08:00
Fix nwjs#1364
diff --git a/src/api/dispatcher_host.cc b/src/api/dispatcher_host.cc
@@ -156,12 +156,13 @@ void DispatcherHost::OnCallObjectMethod(
              << " arguments:" << arguments;
 
   Base* object = GetApiObject(object_id);
-  DLOG(WARNING) << "Unknown object: " << object_id
+  if (object)
+    object->Call(method, arguments);
+  else
+    DLOG(WARNING) << "Unknown object: " << object_id
              << " type:" << type
              << " method:" << method
              << " arguments:" << arguments;
-  if (object)
-    object->Call(method, arguments);
 }
 
 void DispatcherHost::OnCallObjectMethodSync(
diff --git a/src/api/window/window.js b/src/api/window/window.js
@@ -64,6 +64,6 @@ exports.Window = {
     options.object_id = id;
     var routing_id = nw.createShell(url, options);
 
-    return new global.Window(routing_id, options['new-instance'], id);
+    return new global.Window(routing_id, true, id);
   }
 };
diff --git a/src/nw_shell.cc b/src/nw_shell.cc
@@ -191,6 +191,11 @@ Shell::~Shell() {
     }
   }
 
+  if (!is_devtools_ && id_ > 0) {
+    nwapi::DispatcherHost* dhost = nwapi::FindDispatcherHost(web_contents_->GetRenderViewHost());
+    dhost->OnDeallocateObject(id_);
+  }
+
   for (size_t i = 0; i < windows_.size(); ++i) {
     if (windows_[i] == this) {
       windows_.erase(windows_.begin() + i);

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,6 @@ exports.Window = {`
`64`	`64`	`options.object_id = id;`
`65`	`65`	`var routing_id = nw.createShell(url, options);`
`66`	`66`
`67`		`- return new global.Window(routing_id, options['new-instance'], id);`
	`67`	`+ return new global.Window(routing_id, true, id);`
`68`	`68`	`}`
`69`	`69`	`};`
Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,11 @@ Shell::~Shell() {`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`
	`194`	`+ if (!is_devtools_ && id_ > 0) {`
	`195`	`+ nwapi::DispatcherHost* dhost = nwapi::FindDispatcherHost(web_contents_->GetRenderViewHost());`
	`196`	`+ dhost->OnDeallocateObject(id_);`
	`197`	`+ }`
	`198`	`+`
`194`	`199`	`for (size_t i = 0; i < windows_.size(); ++i) {`
`195`	`200`	`if (windows_[i] == this) {`
`196`	`201`	`windows_.erase(windows_.begin() + i);`