[gjs/wip/ptomato/mozjs52: 8/35] js: Global object is implicit in many functions
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/wip/ptomato/mozjs52: 8/35] js: Global object is implicit in many functions
- Date: Sun, 11 Jun 2017 03:12:52 +0000 (UTC)
commit a22d913257851c3f9709c1f173ff394ee0207479
Author: Philip Chimento <philip chimento gmail com>
Date: Sun Mar 19 05:06:48 2017 +0000
js: Global object is implicit in many functions
In many function calls where you had to pass in a global object, it is
now implicit and will use the global for the current scope.
FIXME: Make sure we don't now have unused rooted global objects all over
the place
gi/boxed.cpp | 2 +-
gjs/context.cpp | 2 +-
gjs/coverage.cpp | 12 ++++--------
gjs/jsapi-dynamic-class.cpp | 4 +---
gjs/jsapi-util.cpp | 2 +-
modules/console.cpp | 2 +-
test/gjs-test-call-args.cpp | 8 ++------
7 files changed, 11 insertions(+), 21 deletions(-)
---
diff --git a/gi/boxed.cpp b/gi/boxed.cpp
index 3f3a778..eb126d7 100644
--- a/gi/boxed.cpp
+++ b/gi/boxed.cpp
@@ -594,7 +594,7 @@ define_native_accessor_wrapper(JSContext *cx,
uint32_t id)
{
JSFunction *func = js::NewFunctionWithReserved(cx, call, nargs, 0,
- NULL, func_name);
+ func_name);
if (!func)
return NULL;
diff --git a/gjs/context.cpp b/gjs/context.cpp
index 27e1b81..403c77b 100644
--- a/gjs/context.cpp
+++ b/gjs/context.cpp
@@ -306,7 +306,7 @@ gjs_define_promise_object(JSContext *cx,
.setFile("<Promise>");
JS::RootedValue promise(cx);
- if (!JS::Evaluate(cx, global, options, lie_code, lie_length, &promise)) {
+ if (!JS::Evaluate(cx, options, lie_code, lie_length, &promise)) {
g_bytes_unref(lie_bytes);
return false;
}
diff --git a/gjs/coverage.cpp b/gjs/coverage.cpp
index 52a39df..cff088f 100644
--- a/gjs/coverage.cpp
+++ b/gjs/coverage.cpp
@@ -1312,12 +1312,11 @@ gjs_context_eval_file_in_compartment(GjsContext *context,
.setFileAndLine(filename, start_line_number)
.setSourceIsLazy(true);
JS::RootedScript compiled_script(js_context);
- if (!JS::Compile(js_context, compartment_object, options, stripped_script,
- script_len, &compiled_script))
+ if (!JS::Compile(js_context, options, stripped_script, script_len,
+ &compiled_script))
return false;
- if (!JS::CloneAndExecuteScript(js_context, compartment_object,
- compiled_script)) {
+ if (!JS::CloneAndExecuteScript(js_context, compiled_script)) {
g_free(script);
gjs_log_exception(js_context);
g_set_error(error, GJS_ERROR, GJS_ERROR_FAILED, "Failed to evaluate %s", filename);
@@ -1522,10 +1521,7 @@ gjs_run_script_in_coverage_compartment(GjsCoverage *coverage,
options.setUTF8(true);
JS::RootedValue rval(js_context);
- JS::RootedObject global(js_context,
- JS_GetGlobalForObject(js_context, priv->coverage_statistics));
- if (!JS::Evaluate(js_context, global, options, script, strlen(script),
- &rval)) {
+ if (!JS::Evaluate(js_context, options, script, strlen(script), &rval)) {
gjs_log_exception(js_context);
g_warning("Failed to evaluate <coverage_modifier>");
return false;
diff --git a/gjs/jsapi-dynamic-class.cpp b/gjs/jsapi-dynamic-class.cpp
index 3d70222..7d45339 100644
--- a/gjs/jsapi-dynamic-class.cpp
+++ b/gjs/jsapi-dynamic-class.cpp
@@ -67,8 +67,6 @@ gjs_init_class_dynamic(JSContext *context,
JS_BeginRequest(context);
- JS::RootedObject global(context, gjs_get_import_global(context));
-
/* Class initalization consists of three parts:
- building a prototype
- defining prototype properties and functions
@@ -99,7 +97,7 @@ gjs_init_class_dynamic(JSContext *context,
full_function_name = g_strdup_printf("%s_%s", ns_name, class_name);
constructor_fun = JS_NewFunction(context, constructor_native, nargs, JSFUN_CONSTRUCTOR,
- global, full_function_name);
+ full_function_name);
if (!constructor_fun)
goto out;
diff --git a/gjs/jsapi-util.cpp b/gjs/jsapi-util.cpp
index 617836a..0817f21 100644
--- a/gjs/jsapi-util.cpp
+++ b/gjs/jsapi-util.cpp
@@ -933,7 +933,7 @@ gjs_eval_with_scope(JSContext *context,
.setSourceIsLazy(true);
JS::RootedScript compiled_script(context);
- if (!JS::Compile(context, object, options, script, real_len, &compiled_script))
+ if (!JS::Compile(context, options, script, real_len, &compiled_script))
return false;
JS::AutoObjectVector scope_chain(context);
diff --git a/modules/console.cpp b/modules/console.cpp
index bbc6b9f..57a16b7 100644
--- a/modules/console.cpp
+++ b/modules/console.cpp
@@ -197,7 +197,7 @@ gjs_console_interact(JSContext *context,
JS::CompileOptions options(context);
options.setUTF8(true)
.setFileAndLine("typein", startline);
- if (!JS::Evaluate(context, global, options, buffer->str, buffer->len,
+ if (!JS::Evaluate(context, options, buffer->str, buffer->len,
&result)) {
/* If this was an uncatchable exception, throw another uncatchable
* exception on up to the surrounding JS::Evaluate() in main(). This
diff --git a/test/gjs-test-call-args.cpp b/test/gjs-test-call-args.cpp
index 1adebb8..1331210 100644
--- a/test/gjs-test-call-args.cpp
+++ b/test/gjs-test-call-args.cpp
@@ -272,10 +272,8 @@ run_code(GjsUnitTestFixture *fx,
JS::CompileOptions options(fx->cx, JSVERSION_UNKNOWN);
options.setFileAndLine("unit test", 1);
- JS::RootedObject global(fx->cx, gjs_get_import_global(fx->cx));
JS::RootedValue ignored(fx->cx);
- bool ok = JS::Evaluate(fx->cx, global, options, script, strlen(script),
- &ignored);
+ bool ok = JS::Evaluate(fx->cx, options, script, strlen(script), &ignored);
JS_ReportPendingException(fx->cx);
g_assert_null(fx->message);
@@ -291,10 +289,8 @@ run_code_expect_exception(GjsUnitTestFixture *fx,
JS::CompileOptions options(fx->cx, JSVERSION_UNKNOWN);
options.setFileAndLine("unit test", 1);
- JS::RootedObject global(fx->cx, gjs_get_import_global(fx->cx));
JS::RootedValue ignored(fx->cx);
- bool ok = JS::Evaluate(fx->cx, global, options, script, strlen(script),
- &ignored);
+ bool ok = JS::Evaluate(fx->cx, options, script, strlen(script), &ignored);
g_assert_false(ok);
g_assert_true(JS_IsExceptionPending(fx->cx));
JS_ReportPendingException(fx->cx);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]