summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinícius dos Santos Oliveira <vini.ipsmaker@expertisesolutions.com.br>2015-06-03 19:13:17 -0300
committerVinícius dos Santos Oliveira <vini.ipsmaker@expertisesolutions.com.br>2015-06-03 19:13:17 -0300
commitaf229750c5070544cb874e8b20532731c73910e4 (patch)
tree720da7453b191f8b740f89d5dabc5d6a0c5308f8
parentab5a140691d05d36dc45064ccbfd6df2242b1605 (diff)
updated ecore_js to use v8::Isolate::GetCurrent()
-rw-r--r--src/bindings/ecore_js/ecore_js_event.cc14
-rw-r--r--src/bindings/ecore_js/ecore_js_idle.cc8
-rw-r--r--src/bindings/ecore_js/ecore_js_job.cc2
-rw-r--r--src/bindings/ecore_js/ecore_js_mainloop.cc4
-rw-r--r--src/bindings/ecore_js/ecore_js_timer.cc4
5 files changed, 16 insertions, 16 deletions
diff --git a/src/bindings/ecore_js/ecore_js_event.cc b/src/bindings/ecore_js/ecore_js_event.cc
index 1a5fa8e..72313e3 100644
--- a/src/bindings/ecore_js/ecore_js_event.cc
+++ b/src/bindings/ecore_js/ecore_js_event.cc
@@ -294,7 +294,7 @@ void register_event_handler_add(v8::Isolate *isolate,
294 = reinterpret_cast<compatibility_persistent<Value>*>(d); 294 = reinterpret_cast<compatibility_persistent<Value>*>(d);
295 auto closure = Function::Cast(*persistent->handle()); 295 auto closure = Function::Cast(*persistent->handle());
296 296
297 auto isolate = persistent->GetIsolate(); 297 auto isolate = v8::Isolate::GetCurrent();
298 Handle<Value> args = compatibility_new<Integer>(isolate, type); 298 Handle<Value> args = compatibility_new<Integer>(isolate, type);
299 299
300 auto ret = closure->Call(Undefined(isolate), 1, &args); 300 auto ret = closure->Call(Undefined(isolate), 1, &args);
@@ -338,7 +338,7 @@ void register_event_filter_add(v8::Isolate *isolate,
338 338
339 auto start_cb = [](void *data) -> void* { 339 auto start_cb = [](void *data) -> void* {
340 auto p = reinterpret_cast<compatibility_persistent<Value>*>(data); 340 auto p = reinterpret_cast<compatibility_persistent<Value>*>(data);
341 auto isolate = p->GetIsolate(); 341 auto isolate = v8::Isolate::GetCurrent();
342 auto closure = Function::Cast(*p->handle()); 342 auto closure = Function::Cast(*p->handle());
343 343
344 auto ret = closure->Call(Undefined(isolate), 0, NULL); 344 auto ret = closure->Call(Undefined(isolate), 0, NULL);
@@ -350,7 +350,7 @@ void register_event_filter_add(v8::Isolate *isolate,
350 typedef compatibility_persistent<Value> p_t; 350 typedef compatibility_persistent<Value> p_t;
351 351
352 auto p = reinterpret_cast<p_t*>(data) + 1; 352 auto p = reinterpret_cast<p_t*>(data) + 1;
353 auto isolate = p->GetIsolate(); 353 auto isolate = v8::Isolate::GetCurrent();
354 auto closure = Function::Cast(*p->handle()); 354 auto closure = Function::Cast(*p->handle());
355 355
356 Handle<Value> args[2]{ 356 Handle<Value> args[2]{
@@ -374,7 +374,7 @@ void register_event_filter_add(v8::Isolate *isolate,
374 374
375 Handle<Value> args = p->handle(); 375 Handle<Value> args = p->handle();
376 376
377 closure->Call(Undefined(p->GetIsolate()), 1, &args); 377 closure->Call(Undefined(v8::Isolate::GetCurrent()), 1, &args);
378 }; 378 };
379 379
380 auto ret = ecore_event_filter_add(start_cb, filter_cb, end_cb, p); 380 auto ret = ecore_event_filter_add(start_cb, filter_cb, end_cb, p);
@@ -529,7 +529,7 @@ void register_event_signal_user_handler_add(v8::Isolate *isolate,
529 529
530 auto cb = [](void *d, int type, void *event) -> Eina_Bool { 530 auto cb = [](void *d, int type, void *event) -> Eina_Bool {
531 auto p = reinterpret_cast<compatibility_persistent<Value>*>(d); 531 auto p = reinterpret_cast<compatibility_persistent<Value>*>(d);
532 auto isolate = p->GetIsolate(); 532 auto isolate = v8::Isolate::GetCurrent();
533 auto closure = Function::Cast(*p->handle()); 533 auto closure = Function::Cast(*p->handle());
534 534
535 auto wrapped_event = compatibility_new<Object>(isolate); 535 auto wrapped_event = compatibility_new<Object>(isolate);
@@ -586,7 +586,7 @@ void register_event_signal_exit_handler_add(v8::Isolate *isolate,
586 586
587 auto cb = [](void *d, int type, void *ev) -> Eina_Bool { 587 auto cb = [](void *d, int type, void *ev) -> Eina_Bool {
588 auto p = reinterpret_cast<compatibility_persistent<Value>*>(d); 588 auto p = reinterpret_cast<compatibility_persistent<Value>*>(d);
589 auto isolate = p->GetIsolate(); 589 auto isolate = v8::Isolate::GetCurrent();
590 auto closure = Function::Cast(*p->handle()); 590 auto closure = Function::Cast(*p->handle());
591 591
592 auto wrapped_event = compatibility_new<Object>(isolate); 592 auto wrapped_event = compatibility_new<Object>(isolate);
@@ -653,7 +653,7 @@ void register_event_signal_realtime_handler_add(v8::Isolate *isolate,
653 653
654 auto cb = [](void *d, int type, void *ev) -> Eina_Bool { 654 auto cb = [](void *d, int type, void *ev) -> Eina_Bool {
655 auto p = reinterpret_cast<compatibility_persistent<Value>*>(d); 655 auto p = reinterpret_cast<compatibility_persistent<Value>*>(d);
656 auto isolate = p->GetIsolate(); 656 auto isolate = v8::Isolate::GetCurrent();
657 auto closure = Function::Cast(*p->handle()); 657 auto closure = Function::Cast(*p->handle());
658 658
659 auto wrapped_event = compatibility_new<Object>(isolate); 659 auto wrapped_event = compatibility_new<Object>(isolate);
diff --git a/src/bindings/ecore_js/ecore_js_idle.cc b/src/bindings/ecore_js/ecore_js_idle.cc
index 68848d2..579297e 100644
--- a/src/bindings/ecore_js/ecore_js_idle.cc
+++ b/src/bindings/ecore_js/ecore_js_idle.cc
@@ -134,7 +134,7 @@ void register_idler_add(v8::Isolate *isolate, v8::Handle<v8::Object> global,
134 = reinterpret_cast<compatibility_persistent<Value>*>(data); 134 = reinterpret_cast<compatibility_persistent<Value>*>(data);
135 auto closure = Function::Cast(*persistent->handle()); 135 auto closure = Function::Cast(*persistent->handle());
136 136
137 auto ret = closure->Call(Undefined(persistent->GetIsolate()), 0, 137 auto ret = closure->Call(Undefined(v8::Isolate::GetCurrent()), 0,
138 NULL); 138 NULL);
139 auto bret = ret->IsBoolean() && ret->BooleanValue(); 139 auto bret = ret->IsBoolean() && ret->BooleanValue();
140 140
@@ -174,7 +174,7 @@ void register_idle_enterer_add(v8::Isolate *isolate,
174 = reinterpret_cast<compatibility_persistent<Value>*>(data); 174 = reinterpret_cast<compatibility_persistent<Value>*>(data);
175 auto closure = Function::Cast(*persistent->handle()); 175 auto closure = Function::Cast(*persistent->handle());
176 176
177 auto ret = closure->Call(Undefined(persistent->GetIsolate()), 0, 177 auto ret = closure->Call(Undefined(v8::Isolate::GetCurrent()), 0,
178 NULL); 178 NULL);
179 auto bret = ret->IsBoolean() && ret->BooleanValue(); 179 auto bret = ret->IsBoolean() && ret->BooleanValue();
180 180
@@ -215,7 +215,7 @@ void register_idle_enterer_before_add(v8::Isolate *isolate,
215 = reinterpret_cast<compatibility_persistent<Value>*>(data); 215 = reinterpret_cast<compatibility_persistent<Value>*>(data);
216 auto closure = Function::Cast(*persistent->handle()); 216 auto closure = Function::Cast(*persistent->handle());
217 217
218 auto ret = closure->Call(Undefined(persistent->GetIsolate()), 0, 218 auto ret = closure->Call(Undefined(v8::Isolate::GetCurrent()), 0,
219 NULL); 219 NULL);
220 auto bret = ret->IsBoolean() && ret->BooleanValue(); 220 auto bret = ret->IsBoolean() && ret->BooleanValue();
221 221
@@ -256,7 +256,7 @@ void register_idle_exiter_add(v8::Isolate *isolate,
256 = reinterpret_cast<compatibility_persistent<Value>*>(data); 256 = reinterpret_cast<compatibility_persistent<Value>*>(data);
257 auto closure = Function::Cast(*persistent->handle()); 257 auto closure = Function::Cast(*persistent->handle());
258 258
259 auto ret = closure->Call(Undefined(persistent->GetIsolate()), 0, 259 auto ret = closure->Call(Undefined(v8::Isolate::GetCurrent()), 0,
260 NULL); 260 NULL);
261 auto bret = ret->IsBoolean() && ret->BooleanValue(); 261 auto bret = ret->IsBoolean() && ret->BooleanValue();
262 262
diff --git a/src/bindings/ecore_js/ecore_js_job.cc b/src/bindings/ecore_js/ecore_js_job.cc
index 558aa3a..349fa3d 100644
--- a/src/bindings/ecore_js/ecore_js_job.cc
+++ b/src/bindings/ecore_js/ecore_js_job.cc
@@ -62,7 +62,7 @@ void register_job_add(v8::Isolate *isolate, v8::Handle<v8::Object> global,
62 = reinterpret_cast<compatibility_persistent<Value>*>(data); 62 = reinterpret_cast<compatibility_persistent<Value>*>(data);
63 auto closure = Function::Cast(*persistent->handle()); 63 auto closure = Function::Cast(*persistent->handle());
64 64
65 closure->Call(Undefined(persistent->GetIsolate()), 0, NULL); 65 closure->Call(Undefined(v8::Isolate::GetCurrent()), 0, NULL);
66 66
67 delete persistent; 67 delete persistent;
68 }, f); 68 }, f);
diff --git a/src/bindings/ecore_js/ecore_js_mainloop.cc b/src/bindings/ecore_js/ecore_js_mainloop.cc
index 0d0ab24..3319efd 100644
--- a/src/bindings/ecore_js/ecore_js_mainloop.cc
+++ b/src/bindings/ecore_js/ecore_js_mainloop.cc
@@ -197,7 +197,7 @@ void register_mainloop_thread_safe_call_async(v8::Isolate *isolate,
197 = reinterpret_cast<compatibility_persistent<Value>*>(data); 197 = reinterpret_cast<compatibility_persistent<Value>*>(data);
198 auto closure = Function::Cast(*persistent->handle()); 198 auto closure = Function::Cast(*persistent->handle());
199 199
200 closure->Call(Undefined(persistent->GetIsolate()), 0, NULL); 200 closure->Call(Undefined(v8::Isolate::GetCurrent()), 0, NULL);
201 201
202 delete persistent; 202 delete persistent;
203 }, f); 203 }, f);
@@ -229,7 +229,7 @@ void register_mainloop_thread_safe_call_sync(v8::Isolate *isolate,
229 void *data = ecore_main_loop_thread_safe_call_sync([](void *data) { 229 void *data = ecore_main_loop_thread_safe_call_sync([](void *data) {
230 compatibility_persistent<Value> *persistent 230 compatibility_persistent<Value> *persistent
231 = reinterpret_cast<compatibility_persistent<Value>*>(data); 231 = reinterpret_cast<compatibility_persistent<Value>*>(data);
232 auto isolate = persistent->GetIsolate(); 232 auto isolate = v8::Isolate::GetCurrent();
233 auto closure = Function::Cast(*persistent->handle()); 233 auto closure = Function::Cast(*persistent->handle());
234 auto res = closure->Call(Undefined(isolate), 0, NULL); 234 auto res = closure->Call(Undefined(isolate), 0, NULL);
235 void *ret = new compatibility_persistent<Value>(isolate, res); 235 void *ret = new compatibility_persistent<Value>(isolate, res);
diff --git a/src/bindings/ecore_js/ecore_js_timer.cc b/src/bindings/ecore_js/ecore_js_timer.cc
index 6294dd5..e57bdd0 100644
--- a/src/bindings/ecore_js/ecore_js_timer.cc
+++ b/src/bindings/ecore_js/ecore_js_timer.cc
@@ -175,7 +175,7 @@ void register_timer_add(v8::Isolate *isolate, v8::Handle<v8::Object> global,
175 = reinterpret_cast<compatibility_persistent<Value>*>(data); 175 = reinterpret_cast<compatibility_persistent<Value>*>(data);
176 auto closure = Function::Cast(*persistent->handle()); 176 auto closure = Function::Cast(*persistent->handle());
177 177
178 auto ret = closure->Call(Undefined(persistent->GetIsolate()), 0, 178 auto ret = closure->Call(Undefined(v8::Isolate::GetCurrent()), 0,
179 NULL); 179 NULL);
180 auto bret = ret->IsBoolean() && ret->BooleanValue(); 180 auto bret = ret->IsBoolean() && ret->BooleanValue();
181 181
@@ -219,7 +219,7 @@ void register_timer_loop_add(v8::Isolate *isolate,
219 = reinterpret_cast<compatibility_persistent<Value>*>(d); 219 = reinterpret_cast<compatibility_persistent<Value>*>(d);
220 auto closure = Function::Cast(*persistent->handle()); 220 auto closure = Function::Cast(*persistent->handle());
221 221
222 auto ret = closure->Call(Undefined(persistent->GetIsolate()), 0, 222 auto ret = closure->Call(Undefined(v8::Isolate::GetCurrent()), 0,
223 NULL); 223 NULL);
224 auto bret = ret->IsBoolean() && ret->BooleanValue(); 224 auto bret = ret->IsBoolean() && ret->BooleanValue();
225 225