function.cc: prepare trampoline stuff

Author: romgrk

src/function.cc

@@ -555,20 +555,28 @@ class TrampolineInfo {
     GICallableInfo *info;
     GIScopeType scope_type;
 
-    TrampolineInfo(Handle<Function>  function,
-                   GICallableInfo   *info,
-                   GIScopeType       scope_type);
+    TrampolineInfo(Local<Function> function, GICallableInfo *info, GIScopeType scope_type);
 
     void Dispose();
-    static void Call(ffi_cif *cif, void *result, void **args, void *data);
     void *GetClosure();
+
+    static void Call(ffi_cif *cif, void *result, void **args, void *data);
 };
 
+TrampolineInfo::TrampolineInfo(Local<Function>  function,
+                               GICallableInfo   *info,
+                               GIScopeType       scope_type) {
+    this->closure = g_callable_info_prepare_closure (info, &cif, TrampolineInfo::Call, this);
+    this->persistent.Reset(Isolate::GetCurrent(), function);
+    this->info = g_base_info_ref (info);
+    this->scope_type = scope_type;
+}
+
 void TrampolineInfo::Dispose() {
-    persistent = nullptr;
+    persistent.Reset();
     g_base_info_unref (info);
     g_callable_info_free_closure (info, closure);
-};
+}
 
 void TrampolineInfo::Call(ffi_cif *cif,
                           void *result,
@@ -577,7 +585,7 @@ void TrampolineInfo::Call(ffi_cif *cif,
     TrampolineInfo *trampoline = (TrampolineInfo *) data;
 
     int argc = g_callable_info_get_n_args (trampoline->info);
-    Handle<Value> argv[argc];
+    Local<Value> argv[argc];
 
     for (int i = 0; i < argc; i++) {
         GIArgInfo arg_info;
@@ -587,25 +595,17 @@ void TrampolineInfo::Call(ffi_cif *cif,
         argv[i] = GIArgumentToV8 (&type_info, (GIArgument *) &args[i]);
     }
 
-    Handle<Function> func = trampoline->func;
-    /* Provide a bogus "this" function. Any interested callers should
-     * bind their callbacks to what they're intersted in... */
-    Handle<Object> this_obj = func;
-    Handle<Value> return_value = func->Call (this_obj, argc, argv);
+    Local<Function> func = Nan::New<Function> (trampoline->persistent);
+    Local<Object> this_obj = func;
+
+    Local<Value> return_value = func->Call (this_obj, argc, argv);
+
     GITypeInfo type_info;
     g_callable_info_load_return_type (trampoline->info, &type_info);
+
     V8ToGIArgument (&type_info, (GIArgument *) &result, return_value,
                     g_callable_info_may_return_null (trampoline->info));
 }
-
-TrampolineInfo::TrampolineInfo(Handle<Function>  function,
-                               GICallableInfo   *info,
-                               GIScopeType       scope_type) {
-    this->closure = g_callable_info_prepare_closure (info, &cif, Call, this);
-    this->func = Persistent<Function>::New (function);
-    this->info = g_base_info_ref (info);
-    this->scope_type = scope_type;
-}
 #endif
 
 };