delay destruction of Menu if it's in nested loop

rogerwang · rogerwang · commit 723bab6de6eb · 2016-04-09T23:54:10.000+08:00
Fix nwjs#4697
diff --git a/src/api/base/base.h b/src/api/base/base.h
@@ -57,8 +57,14 @@ class Base {
   std::string extension_id_;
   ObjectManager* object_manager() const { return object_manager_.get(); }
 
- private:
+  bool delay_destruction() { return delay_destruction_; }
+  void set_delay_destruction(bool val) { delay_destruction_ = val; }
+  bool pending_destruction() { return pending_destruction_; }
+  void set_pending_destruction (bool val) { pending_destruction_ = val; }
+ protected:
   int id_;
+  bool delay_destruction_;
+  bool pending_destruction_;
   base::WeakPtr<ObjectManager> object_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Base);
diff --git a/src/api/menu/menu_views.cc b/src/api/menu/menu_views.cc
@@ -124,15 +124,17 @@ void Menu::Popup(int x, int y, content::RenderFrameHost* rfh) {
     screen_position_client->ConvertPointToScreen(target_window,
              &screen_point);
   }
+  set_delay_destruction(true);
   views::MenuRunner runner(menu_model_.get(), views::MenuRunner::CONTEXT_MENU);
-  if (views::MenuRunner::MENU_DELETED ==
+  ignore_result(
       runner.RunMenuAt(top_level_widget,
                        NULL,
                        gfx::Rect(screen_point, gfx::Size()),
                        views::MENU_ANCHOR_TOPRIGHT,
-                       ui::MENU_SOURCE_NONE))
-    return;
-  // menu_->RunMenuAt(screen_point, views::Menu2::ALIGN_TOPLEFT);
+                       ui::MENU_SOURCE_NONE));
+  set_delay_destruction(false);
+  if (pending_destruction())
+    object_manager_->OnDeallocateObject(id_);
 }
 
 void Menu::UpdateKeys(views::FocusManager *focus_manager){
diff --git a/src/api/nw_object.idl b/src/api/nw_object.idl
@@ -10,6 +10,6 @@ namespace nw.Obj {
     static void destroy(long id);
     static void callObjectMethod(long id, DOMString type, DOMString method, any[] arguments);
     static any callObjectMethodSync(long id, DOMString type, DOMString method, any[] arguments);
-    static any callObjectMethodAsync(long id, DOMString type, DOMString method, any[] arguments);
+    static void callObjectMethodAsync(long id, DOMString type, DOMString method, any[] arguments);
   };
 };
diff --git a/src/api/object_manager.cc b/src/api/object_manager.cc
@@ -120,8 +120,14 @@ void ObjectManager::OnAllocateObject(int object_id,
 
 void ObjectManager::OnDeallocateObject(int object_id) {
   DLOG(INFO) << "OnDeallocateObject: object_id:" << object_id;
-  if (objects_registry_.Lookup(object_id))
+  Base* obj = objects_registry_.Lookup(object_id);
+  if (obj) {
+    if (obj->delay_destruction()) {
+      obj->set_pending_destruction(true);
+      return;
+    }
     objects_registry_.Remove(object_id);
+  }
   objects_.erase(object_id);
 }
 
