[gjs/wip/ptomato/mozjs31: 3/3] WIP - stuff
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/wip/ptomato/mozjs31: 3/3] WIP - stuff
- Date: Thu, 10 Nov 2016 05:00:54 +0000 (UTC)
commit 40b416285f5a997930e801bf114c686b5ced1a4d
Author: Philip Chimento <philip endlessm com>
Date: Wed Nov 9 20:59:40 2016 -0800
WIP - stuff
gi/function.cpp | 1 +
gjs/context.cpp | 2 ++
gjs/coverage.cpp | 2 ++
3 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/gi/function.cpp b/gi/function.cpp
index 9ea3860..bd3ee65 100644
--- a/gi/function.cpp
+++ b/gi/function.cpp
@@ -300,6 +300,7 @@ gjs_callback_closure(ffi_cif *cif,
g_callable_info_load_return_type(trampoline->info, &ret_type);
ret_type_is_void = g_type_info_get_tag (&ret_type) == GI_TYPE_TAG_VOID;
+ if (n_outargs == 0 && )
if (n_outargs == 0 && !ret_type_is_void) {
GIArgument argument;
GITransfer transfer;
diff --git a/gjs/context.cpp b/gjs/context.cpp
index a666b13..682d00c 100644
--- a/gjs/context.cpp
+++ b/gjs/context.cpp
@@ -717,6 +717,8 @@ gjs_context_define_string_array(GjsContext *js_context,
GError **error)
{
JSAutoCompartment ac(js_context->context, js_context->global);
+ JSAutoRequest ar(js_context->context);
+
JS::RootedObject global_root(js_context->context, js_context->global);
if (!gjs_define_string_array(js_context->context,
global_root,
diff --git a/gjs/coverage.cpp b/gjs/coverage.cpp
index 8c95caa..4975019 100644
--- a/gjs/coverage.cpp
+++ b/gjs/coverage.cpp
@@ -1498,6 +1498,8 @@ gjs_run_script_in_coverage_compartment(GjsCoverage *coverage,
GjsCoveragePrivate *priv = (GjsCoveragePrivate *) gjs_coverage_get_instance_private(coverage);
JSContext *js_context = (JSContext *) gjs_context_get_native_context(priv->context);
JSAutoCompartment ac(js_context, priv->coverage_statistics);
+ JSAutoRequest ar(js_context);
+
JS::RootedValue rval(js_context);
JS::RootedObject rooted_priv(js_context, priv->coverage_statistics);
if (!gjs_eval_with_scope(js_context, rooted_priv, script, strlen(script),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]