summaryrefslogtreecommitdiffstats
path: root/js/src/shell
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-02-20 12:00:26 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:47:56 +0200
commit009c9dd2f82445de79cfedf03ddd8d321df9b69b (patch)
treebd5f8904957e6feb63af35b8008cd3ac9ada9647 /js/src/shell
parent6407f1abd4f2f598f42cd416d7de9345c77e2444 (diff)
downloadUXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.tar
UXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.tar.gz
UXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.tar.lz
UXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.tar.xz
UXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.zip
Issue #316 - Make the memory GC performance object conditional (WIP)
This was only added for GCubench and likely interfering with building without devtools-server.
Diffstat (limited to 'js/src/shell')
-rw-r--r--js/src/shell/js.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 36558a694..4b0c858a4 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -7090,6 +7090,7 @@ NewGlobalObject(JSContext* cx, JS::CompartmentOptions& options,
if (!DefineOS(cx, glob, fuzzingSafe, &gOutFile, &gErrFile))
return nullptr;
+#ifdef MOZ_DEVTOOLS_SERVER
RootedObject performanceObj(cx, JS_NewObject(cx, nullptr));
if (!performanceObj)
return nullptr;
@@ -7105,6 +7106,7 @@ NewGlobalObject(JSContext* cx, JS::CompartmentOptions& options,
return nullptr;
if (!JS_DefineProperty(cx, mozMemoryObj, "gc", gcObj, JSPROP_ENUMERATE))
return nullptr;
+#endif
/* Initialize FakeDOMObject. */
static const js::DOMCallbacks DOMcallbacks = {