"exit" should be emited for process on exit. Fix nwjs#140.

zcbenz · zcbenz · commit 9ca88162ca8c · 2012-11-13T13:21:52.000+08:00
diff --git a/src/api/api_messages.h b/src/api/api_messages.h
@@ -77,3 +77,6 @@ IPC_MESSAGE_ROUTED1(ShellViewHostMsg_UpdateDraggableRegions,
 // The browser want to open a file.
 IPC_MESSAGE_CONTROL1(ShellViewMsg_Open,
                      std::string /* file name */)
+
+// Browser will quit.
+IPC_MESSAGE_CONTROL0(ShellViewMsg_WillQuit)
diff --git a/src/api/app/app.cc b/src/api/app/app.cc
@@ -31,12 +31,30 @@
 #include "content/public/browser/render_process_host.h"
 
 namespace api {
+
+namespace {
+
+// Get render process host.
+content::RenderProcessHost* GetRenderProcessHost() {
+  content::RenderProcessHost* render_process_host = NULL;
+  std::vector<content::Shell*> windows = content::Shell::windows();
+  for (size_t i = 0; i < windows.size(); ++i) {
+    if (!windows[i]->is_devtools()) {
+      render_process_host = windows[i]->web_contents()->GetRenderProcessHost();
+      break;
+    }
+  }
+
+  return render_process_host;
+}
+
+}  // namespace
   
 // static
 void App::Call(const std::string& method,
                const base::ListValue& arguments) {
   if (method == "Quit") {
-    Quit();
+    Quit(GetRenderProcessHost());
     return;
   } else if (method == "CloseAllWindows") {
     CloseAllWindows();
@@ -82,23 +100,20 @@ void App::CloseAllWindows() {
 }
 
 // static
-void App::Quit() {
+void App::Quit(content::RenderProcessHost* render_process_host) {
+  // Send the quit message.
+  render_process_host->Send(new ShellViewMsg_WillQuit());
+
+  // Then quit.
   MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
 
 // static
 void App::EmitOpenEvent(const std::string& path) {
   // Get the app's renderer process.
-  content::RenderProcessHost* render_process_host = NULL;
-  std::vector<content::Shell*> windows = content::Shell::windows();
-  for (size_t i = 0; i < windows.size(); ++i) {
-    if (!windows[i]->is_devtools()) {
-      render_process_host = windows[i]->web_contents()->GetRenderProcessHost();
-      break;
-    }
-  }
-
+  content::RenderProcessHost* render_process_host = GetRenderProcessHost();
   DCHECK(render_process_host != NULL);
+
   render_process_host->Send(new ShellViewMsg_Open(path));
 }
 
diff --git a/src/api/app/app.h b/src/api/app/app.h
@@ -30,6 +30,7 @@ class ListValue;
 }
 
 namespace content {
+class RenderProcessHost;
 class Shell;
 }
 
@@ -49,7 +50,7 @@ class App {
   static void CloseAllWindows();
 
   // Quit the whole app.
-  static void Quit();
+  static void Quit(content::RenderProcessHost* render_view_host);
 
   // Post "open" event.
   static void EmitOpenEvent(const std::string& path);
diff --git a/src/nw_shell.cc b/src/nw_shell.cc
@@ -113,7 +113,7 @@ Shell::~Shell() {
   }
 
   if (windows_.empty() && quit_message_loop_)
-    api::App::Quit();
+    api::App::Quit(web_contents()->GetRenderProcessHost());
 }
 
 void Shell::SendEvent(const std::string& event) {
diff --git a/src/renderer/shell_render_process_observer.cc b/src/renderer/shell_render_process_observer.cc
@@ -25,6 +25,7 @@
 #include "content/nw/src/api/dispatcher_bindings.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/support/gc_extension.h"
+#include "third_party/node/src/node.h"
 #include "third_party/node/src/req_wrap.h"
 #include "v8/include/v8.h"
 
@@ -42,6 +43,7 @@ bool ShellRenderProcessObserver::OnControlMessageReceived(
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ShellRenderProcessObserver, message)
     IPC_MESSAGE_HANDLER(ShellViewMsg_Open, OnOpen)
+    IPC_MESSAGE_HANDLER(ShellViewMsg_WillQuit, OnWillQuit)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
@@ -76,4 +78,10 @@ void ShellRenderProcessObserver::OnOpen(const std::string& path) {
   }
 }
 
+void ShellRenderProcessObserver::OnWillQuit() {
+  // process.emit('exit');
+  node::EmitExit(node::process);
+  node::RunAtExit();
+}
+
 }  // namespace content
diff --git a/src/renderer/shell_render_process_observer.h b/src/renderer/shell_render_process_observer.h
@@ -41,6 +41,7 @@ class ShellRenderProcessObserver : public RenderProcessObserver {
 
  private:
   void OnOpen(const std::string& path);
+  void OnWillQuit();
 
   DISALLOW_COPY_AND_ASSIGN(ShellRenderProcessObserver);
 };

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ class ListValue;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`namespace content {`
	`33`	`+class RenderProcessHost;`
`33`	`34`	`class Shell;`
`34`	`35`	`}`
`35`	`36`
`@@ -49,7 +50,7 @@ class App {`
`49`	`50`	`static void CloseAllWindows();`
`50`	`51`
`51`	`52`	`// Quit the whole app.`
`52`		`- static void Quit();`
	`53`	`+ static void Quit(content::RenderProcessHost* render_view_host);`
`53`	`54`
`54`	`55`	`// Post "open" event.`
`55`	`56`	`static void EmitOpenEvent(const std::string& path);`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ Shell::~Shell() {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`if (windows_.empty() && quit_message_loop_)`
`116`		`- api::App::Quit();`
	`116`	`+ api::App::Quit(web_contents()->GetRenderProcessHost());`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`void Shell::SendEvent(const std::string& event) {`