From 761b9d22c85744a2e809d9908eb2e28d7fd3d8ac Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 22 Sep 2013 10:43:54 +0800
Subject: [PATCH] Do not reply sync messages when window is closed.

---
 browser/api/atom_api_event.cc        | 16 ++++++++++++----
 browser/api/atom_api_event.h         | 15 +++++++++++----
 browser/api/atom_browser_bindings.cc |  2 +-
 browser/api/atom_browser_bindings.h  |  5 +++--
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/browser/api/atom_api_event.cc b/browser/api/atom_api_event.cc
index 5e66fa7..5a6ff28 100644
--- a/browser/api/atom_api_event.cc
+++ b/browser/api/atom_api_event.cc
@@ -4,9 +4,9 @@
 
 #include "browser/api/atom_api_event.h"
 
+#include "browser/native_window.h"
 #include "common/api/api_messages.h"
 #include "common/string16_conversions.h"
-#include "ipc/ipc_sender.h"
 
 using node::node_isolate;
 
@@ -23,6 +23,8 @@ Event::Event()
 }
 
 Event::~Event() {
+  if (sender_)
+    sender_->RemoveObserver(this);
 }
 
 // static
@@ -46,11 +48,18 @@ v8::Handle<v8::Object> Event::CreateV8Object() {
   return scope.Close(v8_event);
 }
 
-void Event::SetSenderAndMessage(IPC::Sender* sender, IPC::Message* message) {
+void Event::SetSenderAndMessage(NativeWindow* sender, IPC::Message* message) {
   DCHECK(!sender_);
   DCHECK(!message_);
   sender_ = sender;
   message_ = message;
+
+  sender_->AddObserver(this);
+}
+
+void Event::OnWindowClosed() {
+  sender_ = NULL;
+  message_ = NULL;
 }
 
 // static
@@ -78,7 +87,7 @@ v8::Handle<v8::Value> Event::SendReply(const v8::Arguments& args) {
   if (event == NULL)
     return node::ThrowError("Event is already destroyed");
 
-  if (event->sender_ == NULL)
+  if (event->message_ == NULL)
     return node::ThrowError("Can only send reply to synchronous events once");
 
   string16 json = V8ValueToUTF16(args[0]);
@@ -86,7 +95,6 @@ v8::Handle<v8::Value> Event::SendReply(const v8::Arguments& args) {
   AtomViewHostMsg_Message_Sync::WriteReplyParams(event->message_, json);
   event->sender_->Send(event->message_);
 
-  event->sender_ = NULL;
   event->message_ = NULL;
   return v8::Undefined();
 }
diff --git a/browser/api/atom_api_event.h b/browser/api/atom_api_event.h
index 4fd5266..7007892 100644
--- a/browser/api/atom_api_event.h
+++ b/browser/api/atom_api_event.h
@@ -6,19 +6,23 @@
 #define ATOM_BROWSER_ATOM_API_EVENT_H_
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/string16.h"
+#include "browser/native_window_observer.h"
 #include "vendor/node/src/node_object_wrap.h"
 
 namespace IPC {
 class Message;
-class Sender;
 }
 
 namespace atom {
 
+class NativeWindow;
+
 namespace api {
 
-class Event : public node::ObjectWrap {
+class Event : public node::ObjectWrap,
+              public NativeWindowObserver {
  public:
   virtual ~Event();
 
@@ -26,7 +30,7 @@ class Event : public node::ObjectWrap {
   static v8::Handle<v8::Object> CreateV8Object();
 
   // Pass the sender and message to be replied.
-  void SetSenderAndMessage(IPC::Sender* sender, IPC::Message* message);
+  void SetSenderAndMessage(NativeWindow* sender, IPC::Message* message);
 
   // Accessor to return handle_, this follows Google C++ Style.
   v8::Persistent<v8::Object>& handle() { return handle_; }
@@ -37,6 +41,9 @@ class Event : public node::ObjectWrap {
  protected:
   Event();
 
+  // NativeWindowObserver implementations:
+  virtual void OnWindowClosed() OVERRIDE;
+
  private:
   static v8::Handle<v8::Value> New(const v8::Arguments& args);
 
@@ -46,7 +53,7 @@ class Event : public node::ObjectWrap {
   static v8::Persistent<v8::FunctionTemplate> constructor_template_;
 
   // Replyer for the synchronous messages.
-  IPC::Sender* sender_;
+  NativeWindow* sender_;
   IPC::Message* message_;
 
   bool prevent_default_;
diff --git a/browser/api/atom_browser_bindings.cc b/browser/api/atom_browser_bindings.cc
index 85ba15c..44df9a6 100644
--- a/browser/api/atom_browser_bindings.cc
+++ b/browser/api/atom_browser_bindings.cc
@@ -76,7 +76,7 @@ void AtomBrowserBindings::OnRendererMessageSync(
     int routing_id,
     const string16& channel,
     const base::ListValue& args,
-    IPC::Sender* sender,
+    NativeWindow* sender,
     IPC::Message* message) {
   v8::HandleScope scope;
 
diff --git a/browser/api/atom_browser_bindings.h b/browser/api/atom_browser_bindings.h
index 27b9195..dde6997 100644
--- a/browser/api/atom_browser_bindings.h
+++ b/browser/api/atom_browser_bindings.h
@@ -14,11 +14,12 @@ class ListValue;
 
 namespace IPC {
 class Message;
-class Sender;
 }
 
 namespace atom {
 
+class NativeWindow;
+
 class AtomBrowserBindings : public AtomBindings {
  public:
   AtomBrowserBindings();
@@ -38,7 +39,7 @@ class AtomBrowserBindings : public AtomBindings {
                              int routing_id,
                              const string16& channel,
                              const base::ListValue& args,
-                             IPC::Sender* sender,
+                             NativeWindow* sender,
                              IPC::Message* message);
 
   // The require('atom').browserMainParts object.
-- 
2.7.4