mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: prevent menu gc during popup (#20745)

Browse source
This commit is contained in:
Shelley Vohr 2019-10-28 11:26:48 -07:00 committed by John Kleinschmidt
parent d0cdd12521
commit fb8b1fd1c9
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
shell/browser/api/atom_api_menu.h
View file

@ -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 {

3
shell/browser/api/atom_api_menu_mac.mm
View file

@ -56,6 +56,9 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
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();

3
shell/browser/api/atom_api_menu_views.cc
View file

@ -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;