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

fix: gin_helper::Promise in GPUInfoManager must be destroyed before destroying Node/V8 (#46470)

Browse source 
* fix: gin_helper::Promise in GPUInfoManager must be destroyed before destroying Node/V8

Co-authored-by: Yang Liu <ouyangliu.leo@gmail.com>

* fix: use CleanedUpAtExit to control the lifetime of GPUInfoManager

Co-authored-by: Yang Liu <ouyangliu.leo@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Yang Liu <ouyangliu.leo@gmail.com>
This commit is contained in:
trop[bot] 2025-04-03 20:34:52 -05:00 • committed by GitHub
parent 69a38fa5aa
commit e4554f9536
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/api/gpuinfo_manager.cc
View file

@ -17,7 +17,9 @@
namespace electron {
GPUInfoManager* GPUInfoManager::GetInstance() {
return base::Singleton<GPUInfoManager>::get();
// will be deleted by CleanedUpAtExit::DoCleanup
static GPUInfoManager* instance = new GPUInfoManager();
return instance;
}
GPUInfoManager::GPUInfoManager()

4
shell/browser/api/gpuinfo_manager.h
View file

@ -11,6 +11,7 @@
#include "content/browser/gpu/gpu_data_manager_impl.h" // nogncheck
#include "content/public/browser/gpu_data_manager.h"
#include "content/public/browser/gpu_data_manager_observer.h"
#include "shell/common/gin_helper/cleaned_up_at_exit.h"
namespace gin_helper {
template <typename T>
@ -20,7 +21,8 @@ class Promise;
namespace electron {
// GPUInfoManager is a singleton used to manage and fetch GPUInfo
class GPUInfoManager : private content::GpuDataManagerObserver {
class GPUInfoManager : private content::GpuDataManagerObserver,
public gin_helper::CleanedUpAtExit {
public:
static GPUInfoManager* GetInstance();