fix: prevent menu gc during popup (#20745)

electron · Oct 28, 2019 · fb8b1fd · fb8b1fd
1 parent d0cdd12
commit fb8b1fd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/shell/browser/api/atom_api_menu.h b/shell/browser/api/atom_api_menu.h
@@ -12,6 +12,7 @@
 #include "gin/arguments.h"
 #include "shell/browser/api/atom_api_top_level_window.h"
 #include "shell/browser/ui/atom_menu_model.h"
+#include "shell/common/api/locker.h"
 #include "shell/common/gin_helper/trackable_object.h"
 
 namespace electron {

diff --git a/shell/browser/api/atom_api_menu_mac.mm b/shell/browser/api/atom_api_menu_mac.mm
@@ -56,6 +56,9 @@
                         int y,
                         int positioning_item,
                         base::Closure callback) {
+  mate::Locker locker(isolate());
+  v8::HandleScope handle_scope(isolate());
+
   if (!native_window)
     return;
   NSWindow* nswindow = native_window->GetNativeWindow().GetNativeNSWindow();

diff --git a/shell/browser/api/atom_api_menu_views.cc b/shell/browser/api/atom_api_menu_views.cc
@@ -25,6 +25,9 @@ void MenuViews::PopupAt(TopLevelWindow* window,
                         int y,
                         int positioning_item,
                         const base::Closure& callback) {
+  mate::Locker locker(isolate());
+  v8::HandleScope handle_scope(isolate());
+
   auto* native_window = static_cast<NativeWindowViews*>(window->window());
   if (!native_window)
     return;