From 54dad72d922d203e70878803dc9b75ead2ce3600 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 28 Oct 2015 18:32:21 +0800
Subject: [PATCH] Don't leak TranslaterHolder

---
 atom/common/native_mate_converters/callback.cc |  9 +++++----
 atom/common/native_mate_converters/callback.h  | 11 +++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/atom/common/native_mate_converters/callback.cc b/atom/common/native_mate_converters/callback.cc
index 0be90f63e757..dbfa3b4babef 100644
--- a/atom/common/native_mate_converters/callback.cc
+++ b/atom/common/native_mate_converters/callback.cc
@@ -4,21 +4,22 @@
 
 #include "atom/common/native_mate_converters/callback.h"
 
+#include "native_mate/wrappable.h"
+
 namespace mate {
 
 namespace internal {
 
 namespace {
 
-struct TranslaterHolder {
+struct TranslaterHolder : public Wrappable {
   Translater translater;
 };
 
 // Cached JavaScript version of |CallTranslater|.
 v8::Persistent<v8::FunctionTemplate> g_call_translater;
 
-void CallTranslater(v8::Local<v8::External> external, mate::Arguments* args) {
-  TranslaterHolder* holder = static_cast<TranslaterHolder*>(external->Value());
+void CallTranslater(TranslaterHolder* holder, mate::Arguments* args) {
   holder->translater.Run(args);
 }
 
@@ -54,7 +55,7 @@ v8::Local<v8::Value> CreateFunctionFromTranslater(
   return BindFunctionWith(isolate,
                           isolate->GetCurrentContext(),
                           call_translater->GetFunction(),
-                          v8::External::New(isolate, holder));
+                          holder->GetWrapper(isolate));
 }
 
 }  // namespace internal
diff --git a/atom/common/native_mate_converters/callback.h b/atom/common/native_mate_converters/callback.h
index 4349b9997b25..228fc0d3bb1d 100644
--- a/atom/common/native_mate_converters/callback.h
+++ b/atom/common/native_mate_converters/callback.h
@@ -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
 
 template<typename Sig>
-struct Converter<base::Callback<Sig> > {
+struct Converter<base::Callback<Sig>> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
                                    const base::Callback<Sig>& val) {
     // We don't use CreateFunctionTemplate here because it creates a new
     // 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);
   }
   static bool FromV8(v8::Isolate* isolate,