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

Don't leak TranslaterHolder

Browse source
This commit is contained in:
Cheng Zhao 2015-10-28 18:32:21 +08:00
parent 9847747736
commit 54dad72d92
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
atom/common/native_mate_converters/callback.cc
View file

@ -4,21 +4,22 @@
#include "atom/common/native_mate_converters/callback.h" #include "atom/common/native_mate_converters/callback.h"
#include "native_mate/wrappable.h"
namespace mate { namespace mate {
namespace internal { namespace internal {
namespace { namespace {
struct TranslaterHolder { struct TranslaterHolder : public Wrappable {
Translater translater; Translater translater;
}; };
// Cached JavaScript version of |CallTranslater|. // Cached JavaScript version of |CallTranslater|.
v8::Persistent<v8::FunctionTemplate> g_call_translater; v8::Persistent<v8::FunctionTemplate> g_call_translater;
void CallTranslater(v8::Local<v8::External> external, mate::Arguments* args) { void CallTranslater(TranslaterHolder* holder, mate::Arguments* args) {
TranslaterHolder* holder = static_cast<TranslaterHolder*>(external->Value());
holder->translater.Run(args); holder->translater.Run(args);
} }
@ -54,7 +55,7 @@ v8::Local<v8::Value> CreateFunctionFromTranslater(
return BindFunctionWith(isolate, return BindFunctionWith(isolate,
isolate->GetCurrentContext(), isolate->GetCurrentContext(),
call_translater->GetFunction(), call_translater->GetFunction(),
v8::External::New(isolate, holder)); holder->GetWrapper(isolate));
} }
} // namespace internal } // namespace internal

11
atom/common/native_mate_converters/callback.h
View file

@ -101,21 +101,16 @@ struct NativeFunctionInvoker<ReturnType(ArgTypes...)> {
} }
}; };
// Create a static function that accepts generic callback.
template <typename Sig>
Translater ConvertToTranslater(const base::Callback<Sig>& val) {
return base::Bind(&NativeFunctionInvoker<Sig>::Go, val);
}
} // namespace internal } // namespace internal
template<typename Sig> template<typename Sig>
struct Converter<base::Callback<Sig> > { struct Converter<base::Callback<Sig>> {
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
const base::Callback<Sig>& val) { const base::Callback<Sig>& val) {
// We don't use CreateFunctionTemplate here because it creates a new // We don't use CreateFunctionTemplate here because it creates a new
// FunctionTemplate everytime, which is cached by V8 and causes leaks. // FunctionTemplate everytime, which is cached by V8 and causes leaks.
internal::Translater translater = internal::ConvertToTranslater(val); internal::Translater translater = base::Bind(
&internal::NativeFunctionInvoker<Sig>::Go, val);
return internal::CreateFunctionFromTranslater(isolate, translater); return internal::CreateFunctionFromTranslater(isolate, translater);
} }
static bool FromV8(v8::Isolate* isolate, static bool FromV8(v8::Isolate* isolate,