summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-07-03 15:59:00 +0000
committerMoonchild <moonchild@palemoon.org>2020-07-03 15:59:00 +0000
commit121935caed68654adc14a85482a53bc9ac196da8 (patch)
tree1dc803856e154f0b75517d7c47c808e13a6bb0ba /js
parent10e26244192e7cb25663f6dbf47aec215563c038 (diff)
downloadUXP-121935caed68654adc14a85482a53bc9ac196da8.tar
UXP-121935caed68654adc14a85482a53bc9ac196da8.tar.gz
UXP-121935caed68654adc14a85482a53bc9ac196da8.tar.lz
UXP-121935caed68654adc14a85482a53bc9ac196da8.tar.xz
UXP-121935caed68654adc14a85482a53bc9ac196da8.zip
Issue #618 - Fix JSAPI additions to pass the JS context.
Diffstat (limited to 'js')
-rw-r--r--js/src/jsapi.cpp10
-rw-r--r--js/src/jsapi.h4
2 files changed, 8 insertions, 6 deletions
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 9c24f1676..cb0851f80 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -4740,16 +4740,18 @@ JS::GetModuleScript(JSContext* cx, JS::HandleObject moduleArg)
}
JS_PUBLIC_API(bool)
-JS::IsModuleErrored(JSObject* moduleArg)
+JS::IsModuleErrored(JSContext* cx, JSObject* moduleArg)
{
- AssertHeapIsIdle();
+ AssertHeapIsIdle(cx);
+ CHECK_REQUEST(cx);
return moduleArg->as<ModuleObject>().status() == MODULE_STATUS_ERRORED;
}
JS_PUBLIC_API(JS::Value)
-JS::GetModuleError(JSObject* moduleArg)
+JS::GetModuleError(JSContext* cx, JSObject* moduleArg)
{
- AssertHeapIsIdle();
+ AssertHeapIsIdle(cx);
+ CHECK_REQUEST(cx);
return moduleArg->as<ModuleObject>().error();
}
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 9c3bf8151..6d306edc5 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -4396,10 +4396,10 @@ extern JS_PUBLIC_API(JSScript*)
GetModuleScript(JSContext* cx, JS::HandleObject moduleRecord);
extern JS_PUBLIC_API(bool)
-IsModuleErrored(JSObject* moduleRecord);
+IsModuleErrored(JSContext* cx, JSObject* moduleRecord);
extern JS_PUBLIC_API(JS::Value)
-GetModuleError(JSObject* moduleRecord);
+GetModuleError(JSContext* cx, JSObject* moduleRecord);
} /* namespace JS */