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

chore: stop leaking v8 environment (#22761)

Browse source
This commit is contained in:
Jeremy Apthorp 2020-03-20 14:15:55 -07:00 • committed by GitHub
parent 22c17bcc5b
commit 07a049ef1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

23
shell/common/gin_helper/destroyable.cc
View file

@ -4,6 +4,7 @@
#include "shell/common/gin_helper/destroyable.h"
#include "base/no_destructor.h"
#include "gin/converter.h"
#include "shell/common/gin_helper/wrappable_base.h"
@ -11,9 +12,15 @@ namespace gin_helper {
namespace {
// Cached function templates, leaked on exit. (They are leaked in V8 anyway.)
v8::Global<v8::FunctionTemplate> g_destroy_func;
v8::Global<v8::FunctionTemplate> g_is_destroyed_func;
v8::Global<v8::FunctionTemplate>* GetDestroyFunc() {
static base::NoDestructor<v8::Global<v8::FunctionTemplate>> destroy_func;
return destroy_func.get();
}
v8::Global<v8::FunctionTemplate>* GetIsDestroyedFunc() {
static base::NoDestructor<v8::Global<v8::FunctionTemplate>> is_destroyed_func;
return is_destroyed_func.get();
}
void DestroyFunc(const v8::FunctionCallbackInfo<v8::Value>& info) {
v8::Local<v8::Object> holder = info.Holder();
@ -45,22 +52,22 @@ bool Destroyable::IsDestroyed(v8::Local<v8::Object> object) {
void Destroyable::MakeDestroyable(v8::Isolate* isolate,
v8::Local<v8::FunctionTemplate> prototype) {
// Cache the FunctionTemplate of "destroy" and "isDestroyed".
if (g_destroy_func.IsEmpty()) {
if (GetDestroyFunc()->IsEmpty()) {
auto templ = v8::FunctionTemplate::New(isolate, DestroyFunc);
templ->RemovePrototype();
g_destroy_func.Reset(isolate, templ);
GetDestroyFunc()->Reset(isolate, templ);
templ = v8::FunctionTemplate::New(isolate, IsDestroyedFunc);
templ->RemovePrototype();
g_is_destroyed_func.Reset(isolate, templ);
GetIsDestroyedFunc()->Reset(isolate, templ);
}
auto proto_templ = prototype->PrototypeTemplate();
proto_templ->Set(
gin::StringToSymbol(isolate, "destroy"),
v8::Local<v8::FunctionTemplate>::New(isolate, g_destroy_func));
v8::Local<v8::FunctionTemplate>::New(isolate, *GetDestroyFunc()));
proto_templ->Set(
gin::StringToSymbol(isolate, "isDestroyed"),
v8::Local<v8::FunctionTemplate>::New(isolate, g_is_destroyed_func));
v8::Local<v8::FunctionTemplate>::New(isolate, *GetIsDestroyedFunc()));
}
} // namespace gin_helper