aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinícius dos Santos Oliveira <vini.ipsmaker@expertisesolutions.com.br>2015-06-03 01:27:33 -0300
committerVinícius dos Santos Oliveira <vini.ipsmaker@expertisesolutions.com.br>2015-06-03 01:27:33 -0300
commit5de5e8f9f8017d734358b0b65cf5a4ab2a6c8e01 (patch)
tree61777b780c5c17115bfd6a8007bfb67d1139aa9c
parent[eina_js] add: now compatibility_persistent will store v8::Isolate (diff)
downloadefl-5de5e8f9f8017d734358b0b65cf5a4ab2a6c8e01.tar.gz
[ecore_js] refactor: persistent_with_isolate_t -> compatibility_persi...
-rw-r--r--src/bindings/ecore_js/ecore_js_event.cc139
-rw-r--r--src/bindings/ecore_js/ecore_js_event.hh1
-rw-r--r--src/bindings/ecore_js/ecore_js_idle.cc72
-rw-r--r--src/bindings/ecore_js/ecore_js_idle.hh1
-rw-r--r--src/bindings/ecore_js/ecore_js_job.cc26
-rw-r--r--src/bindings/ecore_js/ecore_js_job.hh1
-rw-r--r--src/bindings/ecore_js/ecore_js_mainloop.cc48
-rw-r--r--src/bindings/ecore_js/ecore_js_mainloop.hh1
-rw-r--r--src/bindings/ecore_js/ecore_js_timer.cc38
-rw-r--r--src/bindings/ecore_js/ecore_js_timer.hh1
10 files changed, 127 insertions, 201 deletions
diff --git a/src/bindings/ecore_js/ecore_js_event.cc b/src/bindings/ecore_js/ecore_js_event.cc
index f9c35cb794..1a5fa8e2c3 100644
--- a/src/bindings/ecore_js/ecore_js_event.cc
+++ b/src/bindings/ecore_js/ecore_js_event.cc
@@ -7,18 +7,6 @@
namespace efl { namespace ecore { namespace js {
-struct persistent_with_isolate_t
-{
- template<class S>
- persistent_with_isolate_t(v8::Isolate *isolate, v8::Handle<S> that)
- : isolate(isolate)
- , persistent(isolate, that)
- {}
-
- v8::Isolate *isolate;
- v8::Persistent<v8::Value> persistent;
-};
-
static Ecore_Event *extract_event(v8::Local<v8::Object> object)
{
return compatibility_get_pointer_internal_field<Ecore_Event*>(object, 0);
@@ -63,6 +51,7 @@ static v8::Local<v8::Object> wrap_event_handler(Ecore_Event_Handler *handler,
using v8::String;
using v8::ObjectTemplate;
using v8::FunctionTemplate;
+ using v8::Value;
auto obj_tpl = compatibility_new<ObjectTemplate>(isolate);
obj_tpl->SetInternalFieldCount(1);
@@ -75,7 +64,7 @@ static v8::Local<v8::Object> wrap_event_handler(Ecore_Event_Handler *handler,
auto p = ecore_event_handler_del(extract_event_handler(info.This()));
- delete reinterpret_cast<persistent_with_isolate_t*>(p);
+ delete reinterpret_cast<compatibility_persistent<Value>*>(p);
};
ret->Set(compatibility_new<String>(isolate, "del"),
@@ -98,6 +87,7 @@ static v8::Local<v8::Object> wrap_event_filter(Ecore_Event_Filter *filter,
using v8::String;
using v8::ObjectTemplate;
using v8::FunctionTemplate;
+ using v8::Value;
auto obj_tpl = compatibility_new<ObjectTemplate>(isolate);
obj_tpl->SetInternalFieldCount(1);
@@ -109,7 +99,7 @@ static v8::Local<v8::Object> wrap_event_filter(Ecore_Event_Filter *filter,
return compatibility_return();
auto p = ecore_event_filter_del(extract_event_filter(info.This()));
- delete[] reinterpret_cast<persistent_with_isolate_t*>(p);
+ delete[] reinterpret_cast<compatibility_persistent<Value>*>(p);
};
ret->Set(compatibility_new<String>(isolate, "del"),
@@ -297,18 +287,17 @@ void register_event_handler_add(v8::Isolate *isolate,
auto isolate = args.GetIsolate();
- auto p = new persistent_with_isolate_t(isolate, args[1]);
+ auto p = new compatibility_persistent<Value>(isolate, args[1]);
auto cb = [](void *d, int type, void */*event*/) -> Eina_Bool {
- auto persistent = reinterpret_cast<persistent_with_isolate_t*>(d);
- auto value = Local<Value>::New(persistent->isolate,
- persistent->persistent);
- auto closure = Function::Cast(*value);
+ auto persistent
+ = reinterpret_cast<compatibility_persistent<Value>*>(d);
+ auto closure = Function::Cast(*persistent->handle());
- Handle<Value> args = compatibility_new<Integer>(persistent->isolate,
- type);
+ auto isolate = persistent->GetIsolate();
+ Handle<Value> args = compatibility_new<Integer>(isolate, type);
- auto ret = closure->Call(Undefined(persistent->isolate), 1, &args);
+ auto ret = closure->Call(Undefined(isolate), 1, &args);
auto bret = ret->IsBoolean() && ret->BooleanValue();
return bret ? EINA_TRUE : EINA_FALSE;
@@ -343,54 +332,49 @@ void register_event_filter_add(v8::Isolate *isolate,
auto isolate = args.GetIsolate();
- auto p = new persistent_with_isolate_t[3]{{isolate, args[0]},
- {isolate, args[1]},
- {isolate, args[2]}};
+ auto p = new compatibility_persistent<Value>[3]{{isolate, args[0]},
+ {isolate, args[1]},
+ {isolate, args[2]}};
auto start_cb = [](void *data) -> void* {
- auto p = reinterpret_cast<persistent_with_isolate_t*>(data);
- auto value = Local<Value>::New(p->isolate, p->persistent);
- auto closure = Function::Cast(*value);
+ auto p = reinterpret_cast<compatibility_persistent<Value>*>(data);
+ auto isolate = p->GetIsolate();
+ auto closure = Function::Cast(*p->handle());
- auto ret = closure->Call(Undefined(p->isolate), 0, NULL);
- return new persistent_with_isolate_t{p->isolate, ret};
+ auto ret = closure->Call(Undefined(isolate), 0, NULL);
+ return new compatibility_persistent<Value>{isolate, ret};
};
auto filter_cb = [](void *data, void *loop_data, int type,
void */*event*/) -> Eina_Bool {
- typedef persistent_with_isolate_t p_t;
+ typedef compatibility_persistent<Value> p_t;
auto p = reinterpret_cast<p_t*>(data) + 1;
- auto value = Local<Value>::New(p->isolate, p->persistent);
- auto closure = Function::Cast(*value);
+ auto isolate = p->GetIsolate();
+ auto closure = Function::Cast(*p->handle());
Handle<Value> args[2]{
- [loop_data]() {
- auto ret = reinterpret_cast<p_t*>(loop_data);
- return Local<Value>::New(ret->isolate, ret->persistent);
- }(),
- compatibility_new<Integer>(p->isolate, type)
+ reinterpret_cast<p_t*>(loop_data)->handle(),
+ compatibility_new<Integer>(isolate, type)
};
- auto ret = closure->Call(Undefined(p->isolate), 2, args);
+ auto ret = closure->Call(Undefined(isolate), 2, args);
auto bret = ret->IsBoolean() && ret->BooleanValue();
return bret ? EINA_TRUE : EINA_FALSE;
};
auto end_cb = [](void *user_data, void *func_data) -> void {
- typedef persistent_with_isolate_t p_t;
+ typedef compatibility_persistent<Value> p_t;
auto loop_data = std::unique_ptr<p_t>(reinterpret_cast<p_t*>
(func_data));
auto p = reinterpret_cast<p_t*>(user_data) + 2;
- auto value = Local<Value>::New(p->isolate, p->persistent);
- auto closure = Function::Cast(*value);
+ auto closure = Function::Cast(*p->handle());
- Handle<Value> args = Local<Value>::New(loop_data->isolate,
- loop_data->persistent);
+ Handle<Value> args = p->handle();
- closure->Call(Undefined(p->isolate), 1, &args);
+ closure->Call(Undefined(p->GetIsolate()), 1, &args);
};
auto ret = ecore_event_filter_add(start_cb, filter_cb, end_cb, p);
@@ -541,29 +525,28 @@ void register_event_signal_user_handler_add(v8::Isolate *isolate,
auto isolate = args.GetIsolate();
- auto p = new persistent_with_isolate_t(isolate, args[0]);
+ auto p = new compatibility_persistent<Value>(isolate, args[0]);
auto cb = [](void *d, int type, void *event) -> Eina_Bool {
- auto p = reinterpret_cast<persistent_with_isolate_t*>(d);
- auto value = Local<Value>::New(p->isolate, p->persistent);
- auto closure = Function::Cast(*value);
+ auto p = reinterpret_cast<compatibility_persistent<Value>*>(d);
+ auto isolate = p->GetIsolate();
+ auto closure = Function::Cast(*p->handle());
- auto wrapped_event = compatibility_new<Object>(p->isolate);
+ auto wrapped_event = compatibility_new<Object>(isolate);
{
auto n
= reinterpret_cast<Ecore_Event_Signal_User*>(event)->number;
- wrapped_event->Set(compatibility_new<String>(p->isolate,
- "number"),
- compatibility_new<Integer>(p->isolate, n));
+ wrapped_event->Set(compatibility_new<String>(isolate, "number"),
+ compatibility_new<Integer>(isolate, n));
}
Handle<Value> args[2]{
- compatibility_new<Integer>(p->isolate, type),
+ compatibility_new<Integer>(isolate, type),
wrapped_event
};
- auto ret = closure->Call(Undefined(p->isolate), 2, args);
+ auto ret = closure->Call(Undefined(isolate), 2, args);
auto bret = ret->IsBoolean() && ret->BooleanValue();
return bret ? EINA_TRUE : EINA_FALSE;
@@ -599,14 +582,14 @@ void register_event_signal_exit_handler_add(v8::Isolate *isolate,
auto isolate = args.GetIsolate();
- auto p = new persistent_with_isolate_t(isolate, args[0]);
+ auto p = new compatibility_persistent<Value>(isolate, args[0]);
auto cb = [](void *d, int type, void *ev) -> Eina_Bool {
- auto p = reinterpret_cast<persistent_with_isolate_t*>(d);
- auto value = Local<Value>::New(p->isolate, p->persistent);
- auto closure = Function::Cast(*value);
+ auto p = reinterpret_cast<compatibility_persistent<Value>*>(d);
+ auto isolate = p->GetIsolate();
+ auto closure = Function::Cast(*p->handle());
- auto wrapped_event = compatibility_new<Object>(p->isolate);
+ auto wrapped_event = compatibility_new<Object>(isolate);
{
auto event = reinterpret_cast<Ecore_Event_Signal_Exit*>(ev);
@@ -614,26 +597,24 @@ void register_event_signal_exit_handler_add(v8::Isolate *isolate,
auto quit = event->quit;
auto terminate = event->terminate;
- wrapped_event->Set(compatibility_new<String>(p->isolate,
+ wrapped_event->Set(compatibility_new<String>(isolate,
"interrupt"),
- compatibility_new<Boolean>(p->isolate,
+ compatibility_new<Boolean>(isolate,
interrupt));
- wrapped_event->Set(compatibility_new<String>(p->isolate,
- "quit"),
- compatibility_new<Boolean>(p->isolate,
- quit));
- wrapped_event->Set(compatibility_new<String>(p->isolate,
+ wrapped_event->Set(compatibility_new<String>(isolate, "quit"),
+ compatibility_new<Boolean>(isolate, quit));
+ wrapped_event->Set(compatibility_new<String>(isolate,
"terminate"),
- compatibility_new<Boolean>(p->isolate,
+ compatibility_new<Boolean>(isolate,
terminate));
}
Handle<Value> args[2]{
- compatibility_new<Integer>(p->isolate, type),
+ compatibility_new<Integer>(isolate, type),
wrapped_event
};
- auto ret = closure->Call(Undefined(p->isolate), 2, args);
+ auto ret = closure->Call(Undefined(isolate), 2, args);
auto bret = ret->IsBoolean() && ret->BooleanValue();
return bret ? EINA_TRUE : EINA_FALSE;
@@ -668,28 +649,28 @@ void register_event_signal_realtime_handler_add(v8::Isolate *isolate,
auto isolate = args.GetIsolate();
- auto p = new persistent_with_isolate_t(isolate, args[0]);
+ auto p = new compatibility_persistent<Value>(isolate, args[0]);
auto cb = [](void *d, int type, void *ev) -> Eina_Bool {
- auto p = reinterpret_cast<persistent_with_isolate_t*>(d);
- auto value = Local<Value>::New(p->isolate, p->persistent);
- auto closure = Function::Cast(*value);
+ auto p = reinterpret_cast<compatibility_persistent<Value>*>(d);
+ auto isolate = p->GetIsolate();
+ auto closure = Function::Cast(*p->handle());
- auto wrapped_event = compatibility_new<Object>(p->isolate);
+ auto wrapped_event = compatibility_new<Object>(isolate);
{
auto n
= reinterpret_cast<Ecore_Event_Signal_Realtime*>(ev)->num;
- wrapped_event->Set(compatibility_new<String>(p->isolate, "num"),
- compatibility_new<Integer>(p->isolate, n));
+ wrapped_event->Set(compatibility_new<String>(isolate, "num"),
+ compatibility_new<Integer>(isolate, n));
}
Handle<Value> args[2]{
- compatibility_new<Integer>(p->isolate, type),
+ compatibility_new<Integer>(isolate, type),
wrapped_event
};
- auto ret = closure->Call(Undefined(p->isolate), 2, args);
+ auto ret = closure->Call(Undefined(isolate), 2, args);
auto bret = ret->IsBoolean() && ret->BooleanValue();
return bret ? EINA_TRUE : EINA_FALSE;
diff --git a/src/bindings/ecore_js/ecore_js_event.hh b/src/bindings/ecore_js/ecore_js_event.hh
index e9f4e609a3..e7300efda1 100644
--- a/src/bindings/ecore_js/ecore_js_event.hh
+++ b/src/bindings/ecore_js/ecore_js_event.hh
@@ -14,6 +14,7 @@ using ::efl::eina::js::compatibility_callback_info_type;
using ::efl::eina::js::compatibility_return;
using ::efl::eina::js::compatibility_get_pointer_internal_field;
using ::efl::eina::js::compatibility_set_pointer_internal_field;
+using ::efl::eina::js::compatibility_persistent;
void register_event_none(v8::Isolate *isolate, v8::Handle<v8::Object> global,
v8::Handle<v8::String> name);
diff --git a/src/bindings/ecore_js/ecore_js_idle.cc b/src/bindings/ecore_js/ecore_js_idle.cc
index 8cfffc02e1..68848d2671 100644
--- a/src/bindings/ecore_js/ecore_js_idle.cc
+++ b/src/bindings/ecore_js/ecore_js_idle.cc
@@ -7,18 +7,6 @@
namespace efl { namespace ecore { namespace js {
-struct persistent_with_isolate_t
-{
- template<class S>
- persistent_with_isolate_t(v8::Isolate *isolate, v8::Handle<S> that)
- : isolate(isolate)
- , persistent(isolate, that)
- {}
-
- v8::Isolate *isolate;
- v8::Persistent<v8::Value> persistent;
-};
-
static Ecore_Idler* extract_idler(v8::Local<v8::Object> object)
{
auto ptr = v8::External::Cast(*object->GetInternalField(0))->Value();
@@ -139,16 +127,15 @@ void register_idler_add(v8::Isolate *isolate, v8::Handle<v8::Object> global,
if (args.Length() != 1 || !args[0]->IsFunction())
return compatibility_return();
- persistent_with_isolate_t *f
- = new persistent_with_isolate_t(args.GetIsolate(), args[0]);
+ compatibility_persistent<Value> *f
+ = new compatibility_persistent<Value>(args.GetIsolate(), args[0]);
auto ret = ecore_idler_add([](void *data) -> Eina_Bool {
- persistent_with_isolate_t *persistent
- = reinterpret_cast<persistent_with_isolate_t *>(data);
- auto value = Local<Value>::New(persistent->isolate,
- persistent->persistent);
- auto closure = Function::Cast(*value);
+ compatibility_persistent<Value> *persistent
+ = reinterpret_cast<compatibility_persistent<Value>*>(data);
+ auto closure = Function::Cast(*persistent->handle());
- auto ret = closure->Call(Undefined(persistent->isolate), 0, NULL);
+ auto ret = closure->Call(Undefined(persistent->GetIsolate()), 0,
+ NULL);
auto bret = ret->IsBoolean() && ret->BooleanValue();
if (!bret)
@@ -180,16 +167,15 @@ void register_idle_enterer_add(v8::Isolate *isolate,
if (args.Length() != 1 || !args[0]->IsFunction())
return compatibility_return();
- persistent_with_isolate_t *f
- = new persistent_with_isolate_t(args.GetIsolate(), args[0]);
+ compatibility_persistent<Value> *f
+ = new compatibility_persistent<Value>(args.GetIsolate(), args[0]);
auto ret = ecore_idle_enterer_add([](void *data) -> Eina_Bool {
- persistent_with_isolate_t *persistent
- = reinterpret_cast<persistent_with_isolate_t *>(data);
- auto value = Local<Value>::New(persistent->isolate,
- persistent->persistent);
- auto closure = Function::Cast(*value);
+ compatibility_persistent<Value> *persistent
+ = reinterpret_cast<compatibility_persistent<Value>*>(data);
+ auto closure = Function::Cast(*persistent->handle());
- auto ret = closure->Call(Undefined(persistent->isolate), 0, NULL);
+ auto ret = closure->Call(Undefined(persistent->GetIsolate()), 0,
+ NULL);
auto bret = ret->IsBoolean() && ret->BooleanValue();
if (!bret)
@@ -222,16 +208,15 @@ void register_idle_enterer_before_add(v8::Isolate *isolate,
if (args.Length() != 1 || !args[0]->IsFunction())
return compatibility_return();
- persistent_with_isolate_t *f
- = new persistent_with_isolate_t(args.GetIsolate(), args[0]);
+ compatibility_persistent<Value> *f
+ = new compatibility_persistent<Value>(args.GetIsolate(), args[0]);
auto ret = ecore_idle_enterer_before_add([](void *data) -> Eina_Bool {
- persistent_with_isolate_t *persistent
- = reinterpret_cast<persistent_with_isolate_t *>(data);
- auto value = Local<Value>::New(persistent->isolate,
- persistent->persistent);
- auto closure = Function::Cast(*value);
+ compatibility_persistent<Value> *persistent
+ = reinterpret_cast<compatibility_persistent<Value>*>(data);
+ auto closure = Function::Cast(*persistent->handle());
- auto ret = closure->Call(Undefined(persistent->isolate), 0, NULL);
+ auto ret = closure->Call(Undefined(persistent->GetIsolate()), 0,
+ NULL);
auto bret = ret->IsBoolean() && ret->BooleanValue();
if (!bret)
@@ -264,16 +249,15 @@ void register_idle_exiter_add(v8::Isolate *isolate,
if (args.Length() != 1 || !args[0]->IsFunction())
return compatibility_return();
- persistent_with_isolate_t *f
- = new persistent_with_isolate_t(args.GetIsolate(), args[0]);
+ compatibility_persistent<Value> *f
+ = new compatibility_persistent<Value>(args.GetIsolate(), args[0]);
auto ret = ecore_idle_exiter_add([](void *data) -> Eina_Bool {
- persistent_with_isolate_t *persistent
- = reinterpret_cast<persistent_with_isolate_t *>(data);
- auto value = Local<Value>::New(persistent->isolate,
- persistent->persistent);
- auto closure = Function::Cast(*value);
+ compatibility_persistent<Value> *persistent
+ = reinterpret_cast<compatibility_persistent<Value>*>(data);
+ auto closure = Function::Cast(*persistent->handle());
- auto ret = closure->Call(Undefined(persistent->isolate), 0, NULL);
+ auto ret = closure->Call(Undefined(persistent->GetIsolate()), 0,
+ NULL);
auto bret = ret->IsBoolean() && ret->BooleanValue();
if (!bret)
diff --git a/src/bindings/ecore_js/ecore_js_idle.hh b/src/bindings/ecore_js/ecore_js_idle.hh
index 9b7f513509..09c45ecad9 100644
--- a/src/bindings/ecore_js/ecore_js_idle.hh
+++ b/src/bindings/ecore_js/ecore_js_idle.hh
@@ -14,6 +14,7 @@ using ::efl::eina::js::compatibility_callback_info_type;
using ::efl::eina::js::compatibility_return;
using ::efl::eina::js::compatibility_get_pointer_internal_field;
using ::efl::eina::js::compatibility_set_pointer_internal_field;
+using ::efl::eina::js::compatibility_persistent;
void register_idler_add(v8::Isolate *isolate, v8::Handle<v8::Object> global,
v8::Handle<v8::String> name);
diff --git a/src/bindings/ecore_js/ecore_js_job.cc b/src/bindings/ecore_js/ecore_js_job.cc
index 456561ad20..558aa3a6c3 100644
--- a/src/bindings/ecore_js/ecore_js_job.cc
+++ b/src/bindings/ecore_js/ecore_js_job.cc
@@ -7,18 +7,6 @@
namespace efl { namespace ecore { namespace js {
-struct persistent_with_isolate_t
-{
- template<class S>
- persistent_with_isolate_t(v8::Isolate *isolate, v8::Handle<S> that)
- : isolate(isolate)
- , persistent(isolate, that)
- {}
-
- v8::Isolate *isolate;
- v8::Persistent<v8::Value> persistent;
-};
-
static Ecore_Job* extract_job(v8::Local<v8::Object> object)
{
auto ptr = v8::External::Cast(*object->GetInternalField(0))->Value();
@@ -67,16 +55,14 @@ void register_job_add(v8::Isolate *isolate, v8::Handle<v8::Object> global,
if (args.Length() != 1 || !args[0]->IsFunction())
return compatibility_return();
- persistent_with_isolate_t *f
- = new persistent_with_isolate_t(args.GetIsolate(), args[0]);
+ compatibility_persistent<Value> *f
+ = new compatibility_persistent<Value>(args.GetIsolate(), args[0]);
auto ret = ecore_job_add([](void *data) {
- persistent_with_isolate_t *persistent
- = reinterpret_cast<persistent_with_isolate_t *>(data);
- auto value = Local<Value>::New(persistent->isolate,
- persistent->persistent);
- auto closure = Function::Cast(*value);
+ compatibility_persistent<Value> *persistent
+ = reinterpret_cast<compatibility_persistent<Value>*>(data);
+ auto closure = Function::Cast(*persistent->handle());
- closure->Call(Undefined(persistent->isolate), 0, NULL);
+ closure->Call(Undefined(persistent->GetIsolate()), 0, NULL);
delete persistent;
}, f);
diff --git a/src/bindings/ecore_js/ecore_js_job.hh b/src/bindings/ecore_js/ecore_js_job.hh
index f950062b29..6ed03239a8 100644
--- a/src/bindings/ecore_js/ecore_js_job.hh
+++ b/src/bindings/ecore_js/ecore_js_job.hh
@@ -14,6 +14,7 @@ using ::efl::eina::js::compatibility_callback_info_type;
using ::efl::eina::js::compatibility_return;
using ::efl::eina::js::compatibility_get_pointer_internal_field;
using ::efl::eina::js::compatibility_set_pointer_internal_field;
+using ::efl::eina::js::compatibility_persistent;
void register_job_add(v8::Isolate *isolate, v8::Handle<v8::Object> global,
v8::Handle<v8::String> name);
diff --git a/src/bindings/ecore_js/ecore_js_mainloop.cc b/src/bindings/ecore_js/ecore_js_mainloop.cc
index 1924e86666..0d0ab24c1d 100644
--- a/src/bindings/ecore_js/ecore_js_mainloop.cc
+++ b/src/bindings/ecore_js/ecore_js_mainloop.cc
@@ -7,18 +7,6 @@
namespace efl { namespace ecore { namespace js {
-struct persistent_with_isolate_t
-{
- template<class S>
- persistent_with_isolate_t(v8::Isolate *isolate, v8::Handle<S> that)
- : isolate(isolate)
- , persistent(isolate, that)
- {}
-
- v8::Isolate *isolate;
- v8::Persistent<v8::Value> persistent;
-};
-
EAPI
void register_callback_cancel(v8::Isolate *isolate,
v8::Handle<v8::Object> global,
@@ -202,16 +190,14 @@ void register_mainloop_thread_safe_call_async(v8::Isolate *isolate,
if (args.Length() != 1 || !args[0]->IsFunction())
return compatibility_return();
- persistent_with_isolate_t *f
- = new persistent_with_isolate_t(args.GetIsolate(), args[0]);
+ compatibility_persistent<Value> *f
+ = new compatibility_persistent<Value>(args.GetIsolate(), args[0]);
ecore_main_loop_thread_safe_call_async([](void *data) {
- persistent_with_isolate_t *persistent
- = reinterpret_cast<persistent_with_isolate_t *>(data);
- auto value = Local<Value>::New(persistent->isolate,
- persistent->persistent);
- auto closure = Function::Cast(*value);
+ compatibility_persistent<Value> *persistent
+ = reinterpret_cast<compatibility_persistent<Value>*>(data);
+ auto closure = Function::Cast(*persistent->handle());
- closure->Call(Undefined(persistent->isolate), 0, NULL);
+ closure->Call(Undefined(persistent->GetIsolate()), 0, NULL);
delete persistent;
}, f);
@@ -238,25 +224,23 @@ void register_mainloop_thread_safe_call_sync(v8::Isolate *isolate,
if (args.Length() != 1 || !args[0]->IsFunction())
return compatibility_return();
- auto f = new persistent_with_isolate_t(args.GetIsolate(), args[0]);
+ auto f = new compatibility_persistent<Value>(args.GetIsolate(),
+ args[0]);
void *data = ecore_main_loop_thread_safe_call_sync([](void *data) {
- persistent_with_isolate_t *persistent
- = reinterpret_cast<persistent_with_isolate_t*>(data);
- auto value = Local<Value>::New(persistent->isolate,
- persistent->persistent);
- auto closure = Function::Cast(*value);
- auto res = closure->Call(Undefined(persistent->isolate), 0,
- NULL);
- void *ret = new persistent_with_isolate_t(persistent->isolate,
- res);
+ compatibility_persistent<Value> *persistent
+ = reinterpret_cast<compatibility_persistent<Value>*>(data);
+ auto isolate = persistent->GetIsolate();
+ auto closure = Function::Cast(*persistent->handle());
+ auto res = closure->Call(Undefined(isolate), 0, NULL);
+ void *ret = new compatibility_persistent<Value>(isolate, res);
delete persistent;
return ret;
}, f);
- auto ret = reinterpret_cast<persistent_with_isolate_t*>(data);
- auto value = Local<Value>::New(ret->isolate, ret->persistent);
+ auto ret = reinterpret_cast<compatibility_persistent<Value>*>(data);
+ auto value = ret->handle();
delete ret;
diff --git a/src/bindings/ecore_js/ecore_js_mainloop.hh b/src/bindings/ecore_js/ecore_js_mainloop.hh
index 968f13fc09..6dd192db15 100644
--- a/src/bindings/ecore_js/ecore_js_mainloop.hh
+++ b/src/bindings/ecore_js/ecore_js_mainloop.hh
@@ -14,6 +14,7 @@ using ::efl::eina::js::compatibility_callback_info_type;
using ::efl::eina::js::compatibility_return;
using ::efl::eina::js::compatibility_get_pointer_internal_field;
using ::efl::eina::js::compatibility_set_pointer_internal_field;
+using ::efl::eina::js::compatibility_persistent;
void register_callback_cancel(v8::Isolate *isolate,
v8::Handle<v8::Object> global,
diff --git a/src/bindings/ecore_js/ecore_js_timer.cc b/src/bindings/ecore_js/ecore_js_timer.cc
index 26cb26d555..6294dd570f 100644
--- a/src/bindings/ecore_js/ecore_js_timer.cc
+++ b/src/bindings/ecore_js/ecore_js_timer.cc
@@ -9,18 +9,6 @@
namespace efl { namespace ecore { namespace js {
-struct persistent_with_isolate_t
-{
- template<class S>
- persistent_with_isolate_t(v8::Isolate *isolate, v8::Handle<S> that)
- : isolate(isolate)
- , persistent(isolate, that)
- {}
-
- v8::Isolate *isolate;
- v8::Persistent<v8::Value> persistent;
-};
-
static Ecore_Timer* extract_timer(v8::Local<v8::Object> object)
{
auto ptr = v8::External::Cast(*object->GetInternalField(0))->Value();
@@ -179,17 +167,16 @@ void register_timer_add(v8::Isolate *isolate, v8::Handle<v8::Object> global,
return compatibility_return();
}
- persistent_with_isolate_t *f
- = new persistent_with_isolate_t(args.GetIsolate(), args[1]);
+ compatibility_persistent<Value> *f
+ = new compatibility_persistent<Value>(args.GetIsolate(), args[1]);
auto cb = [](void *data) -> Eina_Bool {
auto persistent
- = reinterpret_cast<persistent_with_isolate_t *>(data);
- auto value = Local<Value>::New(persistent->isolate,
- persistent->persistent);
- auto closure = Function::Cast(*value);
+ = reinterpret_cast<compatibility_persistent<Value>*>(data);
+ auto closure = Function::Cast(*persistent->handle());
- auto ret = closure->Call(Undefined(persistent->isolate), 0, NULL);
+ auto ret = closure->Call(Undefined(persistent->GetIsolate()), 0,
+ NULL);
auto bret = ret->IsBoolean() && ret->BooleanValue();
if (!bret)
@@ -224,17 +211,16 @@ void register_timer_loop_add(v8::Isolate *isolate,
return compatibility_return();
}
- persistent_with_isolate_t *f
- = new persistent_with_isolate_t(args.GetIsolate(), args[1]);
+ compatibility_persistent<Value> *f
+ = new compatibility_persistent<Value>(args.GetIsolate(), args[1]);
auto cb = [](void *d) -> Eina_Bool {
auto persistent
- = reinterpret_cast<persistent_with_isolate_t *>(d);
- auto value = Local<Value>::New(persistent->isolate,
- persistent->persistent);
- auto closure = Function::Cast(*value);
+ = reinterpret_cast<compatibility_persistent<Value>*>(d);
+ auto closure = Function::Cast(*persistent->handle());
- auto ret = closure->Call(Undefined(persistent->isolate), 0, NULL);
+ auto ret = closure->Call(Undefined(persistent->GetIsolate()), 0,
+ NULL);
auto bret = ret->IsBoolean() && ret->BooleanValue();
if (!bret)
diff --git a/src/bindings/ecore_js/ecore_js_timer.hh b/src/bindings/ecore_js/ecore_js_timer.hh
index e1e65e1020..e13457eb27 100644
--- a/src/bindings/ecore_js/ecore_js_timer.hh
+++ b/src/bindings/ecore_js/ecore_js_timer.hh
@@ -14,6 +14,7 @@ using ::efl::eina::js::compatibility_callback_info_type;
using ::efl::eina::js::compatibility_return;
using ::efl::eina::js::compatibility_get_pointer_internal_field;
using ::efl::eina::js::compatibility_set_pointer_internal_field;
+using ::efl::eina::js::compatibility_persistent;
void register_timer_precision_get(v8::Isolate *isolate,
v8::Handle<v8::Object> global,