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

fix: tray garbage collection (#33040)

Browse source
This commit is contained in:
Shelley Vohr 2022-02-24 20:03:59 +01:00 committed by GitHub
parent 8cf345660c
commit c5a2af7811
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
shell/browser/api/electron_api_tray.cc
View file

@ -89,8 +89,10 @@ gin::Handle<Tray> Tray::New(gin_helper::ErrorThrower thrower,
} }
#endif #endif
return gin::CreateHandle(thrower.isolate(), auto handle = gin::CreateHandle(args->isolate(),
new Tray(args->isolate(), image, guid)); new Tray(args->isolate(), image, guid));
handle->Pin(args->isolate());
return handle;
} }
void Tray::OnClicked(const gfx::Rect& bounds, void Tray::OnClicked(const gfx::Rect& bounds,
@ -180,6 +182,7 @@ void Tray::OnDragEnded() {
} }
void Tray::Destroy() { void Tray::Destroy() {
Unpin();
menu_.Reset(); menu_.Reset();
tray_icon_.reset(); tray_icon_.reset();
} }

2
shell/browser/api/electron_api_tray.h
View file

@ -19,6 +19,7 @@
#include "shell/common/gin_helper/cleaned_up_at_exit.h" #include "shell/common/gin_helper/cleaned_up_at_exit.h"
#include "shell/common/gin_helper/constructible.h" #include "shell/common/gin_helper/constructible.h"
#include "shell/common/gin_helper/error_thrower.h" #include "shell/common/gin_helper/error_thrower.h"
#include "shell/common/gin_helper/pinnable.h"
namespace gfx { namespace gfx {
class Image; class Image;
@ -38,6 +39,7 @@ class Tray : public gin::Wrappable<Tray>,
public gin_helper::EventEmitterMixin<Tray>, public gin_helper::EventEmitterMixin<Tray>,
public gin_helper::Constructible<Tray>, public gin_helper::Constructible<Tray>,
public gin_helper::CleanedUpAtExit, public gin_helper::CleanedUpAtExit,
public gin_helper::Pinnable<Tray>,
public TrayIconObserver { public TrayIconObserver {
public: public:
// gin_helper::Constructible // gin_helper::Constructible