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

Pass Handle to upper HandleScope when returning a V8 Handle

Browse source
This commit is contained in:
Cheng Zhao 2015-05-22 21:23:16 +08:00
parent 269be86998
commit 1696237a3f
2 changed files with 140 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

117
native_mate/callback.h
View file

@ -22,6 +22,17 @@ typedef scoped_refptr<RefCountedPersistent<v8::Function> > SafeV8Function;
template<typename Sig> template<typename Sig>
struct V8FunctionInvoker; struct V8FunctionInvoker;
template<typename V>
struct V8FunctionInvoker<v8::Local<V>()> {
static v8::Local<V> Go(v8::Isolate* isolate, SafeV8Function function) {
Locker locker(isolate);
v8::EscapableHandleScope handle_scope(isolate);
v8::Local<v8::Function> holder = function->NewHandle();
v8::Local<v8::Value> val(holder->Call(holder, 0, NULL));
return handle_scope.Escape(val);
}
};
template<typename R> template<typename R>
struct V8FunctionInvoker<R()> { struct V8FunctionInvoker<R()> {
static R Go(v8::Isolate* isolate, SafeV8Function function) { static R Go(v8::Isolate* isolate, SafeV8Function function) {
@ -45,6 +56,20 @@ struct V8FunctionInvoker<void()> {
} }
}; };
template<typename V, typename P1>
struct V8FunctionInvoker<v8::Local<V>(P1)> {
static v8::Local<V> Go(v8::Isolate* isolate, SafeV8Function function, P1 a1) {
Locker locker(isolate);
v8::EscapableHandleScope handle_scope(isolate);
v8::Local<v8::Function> holder = function->NewHandle();
v8::Local<v8::Value> args[] = {
ConvertToV8(isolate, a1),
};
v8::Local<v8::Value> val(holder->Call(holder, arraysize(args), args));
return handle_scope.Escape(val);
}
};
template<typename R, typename P1> template<typename R, typename P1>
struct V8FunctionInvoker<R(P1)> { struct V8FunctionInvoker<R(P1)> {
static R Go(v8::Isolate* isolate, SafeV8Function function, P1 a1) { static R Go(v8::Isolate* isolate, SafeV8Function function, P1 a1) {
@ -74,6 +99,22 @@ struct V8FunctionInvoker<void(P1)> {
} }
}; };
template<typename V, typename P1, typename P2>
struct V8FunctionInvoker<v8::Local<V>(P1, P2)> {
static v8::Local<V> Go(v8::Isolate* isolate, SafeV8Function function, P1 a1,
P2 a2) {
Locker locker(isolate);
v8::EscapableHandleScope handle_scope(isolate);
v8::Local<v8::Function> holder = function->NewHandle();
v8::Local<v8::Value> args[] = {
ConvertToV8(isolate, a1),
ConvertToV8(isolate, a2),
};
v8::Local<v8::Value> val(holder->Call(holder, arraysize(args), args));
return handle_scope.Escape(val);
}
};
template<typename R, typename P1, typename P2> template<typename R, typename P1, typename P2>
struct V8FunctionInvoker<R(P1, P2)> { struct V8FunctionInvoker<R(P1, P2)> {
static R Go(v8::Isolate* isolate, SafeV8Function function, P1 a1, P2 a2) { static R Go(v8::Isolate* isolate, SafeV8Function function, P1 a1, P2 a2) {
@ -105,6 +146,23 @@ struct V8FunctionInvoker<void(P1, P2)> {
} }
}; };
template<typename V, typename P1, typename P2, typename P3>
struct V8FunctionInvoker<v8::Local<V>(P1, P2, P3)> {
static v8::Local<V> Go(v8::Isolate* isolate, SafeV8Function function, P1 a1,
P2 a2, P3 a3) {
Locker locker(isolate);
v8::EscapableHandleScope handle_scope(isolate);
v8::Local<v8::Function> holder = function->NewHandle();
v8::Local<v8::Value> args[] = {
ConvertToV8(isolate, a1),
ConvertToV8(isolate, a2),
ConvertToV8(isolate, a3),
};
v8::Local<v8::Value> val(holder->Call(holder, arraysize(args), args));
return handle_scope.Escape(val);
}
};
template<typename R, typename P1, typename P2, typename P3> template<typename R, typename P1, typename P2, typename P3>
struct V8FunctionInvoker<R(P1, P2, P3)> { struct V8FunctionInvoker<R(P1, P2, P3)> {
static R Go(v8::Isolate* isolate, SafeV8Function function, P1 a1, P2 a2, static R Go(v8::Isolate* isolate, SafeV8Function function, P1 a1, P2 a2,
@ -140,6 +198,24 @@ struct V8FunctionInvoker<void(P1, P2, P3)> {
} }
}; };
template<typename V, typename P1, typename P2, typename P3, typename P4>
struct V8FunctionInvoker<v8::Local<V>(P1, P2, P3, P4)> {
static v8::Local<V> Go(v8::Isolate* isolate, SafeV8Function function, P1 a1,
P2 a2, P3 a3, P4 a4) {
Locker locker(isolate);
v8::EscapableHandleScope handle_scope(isolate);
v8::Local<v8::Function> holder = function->NewHandle();
v8::Local<v8::Value> args[] = {
ConvertToV8(isolate, a1),
ConvertToV8(isolate, a2),
ConvertToV8(isolate, a3),
ConvertToV8(isolate, a4),
};
v8::Local<v8::Value> val(holder->Call(holder, arraysize(args), args));
return handle_scope.Escape(val);
}
};
template<typename R, typename P1, typename P2, typename P3, typename P4> template<typename R, typename P1, typename P2, typename P3, typename P4>
struct V8FunctionInvoker<R(P1, P2, P3, P4)> { struct V8FunctionInvoker<R(P1, P2, P3, P4)> {
static R Go(v8::Isolate* isolate, SafeV8Function function, P1 a1, P2 a2, static R Go(v8::Isolate* isolate, SafeV8Function function, P1 a1, P2 a2,
@ -177,6 +253,26 @@ struct V8FunctionInvoker<void(P1, P2, P3, P4)> {
} }
}; };
template<typename V, typename P1, typename P2, typename P3, typename P4,
typename P5>
struct V8FunctionInvoker<v8::Local<V>(P1, P2, P3, P4, P5)> {
static v8::Local<V> Go(v8::Isolate* isolate, SafeV8Function function, P1 a1,
P2 a2, P3 a3, P4 a4, P5 a5) {
Locker locker(isolate);
v8::EscapableHandleScope handle_scope(isolate);
v8::Local<v8::Function> holder = function->NewHandle();
v8::Local<v8::Value> args[] = {
ConvertToV8(isolate, a1),
ConvertToV8(isolate, a2),
ConvertToV8(isolate, a3),
ConvertToV8(isolate, a4),
ConvertToV8(isolate, a5),
};
v8::Local<v8::Value> val(holder->Call(holder, arraysize(args), args));
return handle_scope.Escape(val);
}
};
template<typename R, typename P1, typename P2, typename P3, typename P4, template<typename R, typename P1, typename P2, typename P3, typename P4,
typename P5> typename P5>
struct V8FunctionInvoker<R(P1, P2, P3, P4, P5)> { struct V8FunctionInvoker<R(P1, P2, P3, P4, P5)> {
@ -217,6 +313,27 @@ struct V8FunctionInvoker<void(P1, P2, P3, P4, P5)> {
} }
}; };
template<typename V, typename P1, typename P2, typename P3, typename P4,
typename P5, typename P6>
struct V8FunctionInvoker<v8::Local<V>(P1, P2, P3, P4, P5, P6)> {
static v8::Local<V> Go(v8::Isolate* isolate, SafeV8Function function, P1 a1,
P2 a2, P3 a3, P4 a4, P5 a5, P6 a6) {
Locker locker(isolate);
v8::EscapableHandleScope handle_scope(isolate);
v8::Local<v8::Function> holder = function->NewHandle();
v8::Local<v8::Value> args[] = {
ConvertToV8(isolate, a1),
ConvertToV8(isolate, a2),
ConvertToV8(isolate, a3),
ConvertToV8(isolate, a4),
ConvertToV8(isolate, a5),
ConvertToV8(isolate, a6),
};
v8::Local<v8::Value> val(holder->Call(holder, arraysize(args), args));
return handle_scope.Escape(val);
}
};
template<typename R, typename P1, typename P2, typename P3, typename P4, template<typename R, typename P1, typename P2, typename P3, typename P4,
typename P5, typename P6> typename P5, typename P6>
struct V8FunctionInvoker<R(P1, P2, P3, P4, P5, P6)> { struct V8FunctionInvoker<R(P1, P2, P3, P4, P5, P6)> {

23
native_mate/callback.h.pump
View file

@ -29,6 +29,29 @@ $range ARITY 0..MAX_ARITY
$for ARITY [[ $for ARITY [[
$range ARG 1..ARITY $range ARG 1..ARITY
template<typename V$for ARG [[, typename P$(ARG)]]>
struct V8FunctionInvoker<v8::Local<V>($for ARG , [[P$(ARG)]])> {
static v8::Local<V> Go(v8::Isolate* isolate, SafeV8Function function$for ARG [[, P$(ARG) a$(ARG)]]) {
Locker locker(isolate);
v8::EscapableHandleScope handle_scope(isolate);
v8::Local<v8::Function> holder = function->NewHandle();
$if ARITY == 0 [[
v8::Local<v8::Value> val(holder->Call(holder, 0, NULL));
]] $else [[
v8::Local<v8::Value> args[] = {
$for ARG [[
ConvertToV8(isolate, a$(ARG)),
]]
};
v8::Local<v8::Value> val(holder->Call(holder, arraysize(args), args));
]]
return handle_scope.Escape(val);
}
};
template<typename R$for ARG [[, typename P$(ARG)]]> template<typename R$for ARG [[, typename P$(ARG)]]>
struct V8FunctionInvoker<R($for ARG , [[P$(ARG)]])> { struct V8FunctionInvoker<R($for ARG , [[P$(ARG)]])> {
static R Go(v8::Isolate* isolate, SafeV8Function function$for ARG [[, P$(ARG) a$(ARG)]]) { static R Go(v8::Isolate* isolate, SafeV8Function function$for ARG [[, P$(ARG) a$(ARG)]]) {