summaryrefslogtreecommitdiffstats
path: root/js/src
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-07-03 14:21:27 +0000
committerMoonchild <moonchild@palemoon.org>2020-07-10 18:30:03 +0000
commitef8d18da70c2c2efedc5e4db1dca0ece30ac5d14 (patch)
tree48d9bbaeb28e7dbc76317b5c5324404aebb0dcc3 /js/src
parent7bf3e4c46475a7aa936d702eb38d65d9126008f2 (diff)
downloadUXP-ef8d18da70c2c2efedc5e4db1dca0ece30ac5d14.tar
UXP-ef8d18da70c2c2efedc5e4db1dca0ece30ac5d14.tar.gz
UXP-ef8d18da70c2c2efedc5e4db1dca0ece30ac5d14.tar.lz
UXP-ef8d18da70c2c2efedc5e4db1dca0ece30ac5d14.tar.xz
UXP-ef8d18da70c2c2efedc5e4db1dca0ece30ac5d14.zip
Issue #618 - Match JSAPI names with the changes in 9ca74147225eed305e28c7887f9b2251aeeb0f36
Ref: BZ 1388728
Diffstat (limited to 'js/src')
-rw-r--r--js/src/jsapi.cpp4
-rw-r--r--js/src/jsapi.h13
2 files changed, 8 insertions, 9 deletions
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index f8c34885b..9c24f1676 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -4704,7 +4704,7 @@ JS::GetModuleHostDefinedField(JSObject* module)
}
JS_PUBLIC_API(bool)
-JS::ModuleDeclarationInstantiation(JSContext* cx, JS::HandleObject moduleArg)
+JS::ModuleInstantiate(JSContext* cx, JS::HandleObject moduleArg)
{
AssertHeapIsIdle(cx);
CHECK_REQUEST(cx);
@@ -4713,7 +4713,7 @@ JS::ModuleDeclarationInstantiation(JSContext* cx, JS::HandleObject moduleArg)
}
JS_PUBLIC_API(bool)
-JS::ModuleEvaluation(JSContext* cx, JS::HandleObject moduleArg)
+JS::ModuleEvaluate(JSContext* cx, JS::HandleObject moduleArg)
{
AssertHeapIsIdle(cx);
CHECK_REQUEST(cx);
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 5e0259587..9c3bf8151 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -4356,28 +4356,27 @@ extern JS_PUBLIC_API(JS::Value)
GetModuleHostDefinedField(JSObject* module);
/*
- * Perform the ModuleDeclarationInstantiation operation on on the give source
- * text module record.
+ * Perform the ModuleInstantiate operation on the given source text module
+ * record.
*
* This transitively resolves all module dependencies (calling the
* HostResolveImportedModule hook) and initializes the environment record for
* the module.
*/
extern JS_PUBLIC_API(bool)
-ModuleDeclarationInstantiation(JSContext* cx, JS::HandleObject moduleRecord);
+ModuleInstantiate(JSContext* cx, JS::HandleObject moduleRecord);
/*
- * Perform the ModuleEvaluation operation on on the give source text module
- * record.
+ * Perform the ModuleEvaluate operation on the given source text module record.
*
* This does nothing if this module has already been evaluated. Otherwise, it
* transitively evaluates all dependences of this module and then evaluates this
* module.
*
- * ModuleDeclarationInstantiation must have completed prior to calling this.
+ * ModuleInstantiate must have completed prior to calling this.
*/
extern JS_PUBLIC_API(bool)
-ModuleEvaluation(JSContext* cx, JS::HandleObject moduleRecord);
+ModuleEvaluate(JSContext* cx, JS::HandleObject moduleRecord);
/*
* Get a list of the module specifiers used by a source text module