diff options
Diffstat (limited to 'js/xpconnect')
| -rw-r--r-- | js/xpconnect/idl/xpccomponents.idl | 5 | ||||
| -rw-r--r-- | js/xpconnect/src/XPCComponents.cpp | 9 | ||||
| -rw-r--r-- | js/xpconnect/src/XPCJSContext.cpp | 10 | ||||
| -rw-r--r-- | js/xpconnect/src/XPCShellImpl.cpp | 18 |
4 files changed, 1 insertions, 41 deletions
diff --git a/js/xpconnect/idl/xpccomponents.idl b/js/xpconnect/idl/xpccomponents.idl index 711ea4c64..611091c4b 100644 --- a/js/xpconnect/idl/xpccomponents.idl +++ b/js/xpconnect/idl/xpccomponents.idl @@ -123,7 +123,7 @@ interface ScheduledGCCallback : nsISupports /** * interface of Components.utils */ -[scriptable, uuid(86003fe3-ee9a-4620-91dc-eef8b1e58815)] +[scriptable, uuid(a6e66965-4b9a-4846-8985-985e71aaf549)] interface nsIXPCComponents_Utils : nsISupports { @@ -530,9 +530,6 @@ interface nsIXPCComponents_Utils : nsISupports attribute boolean ion; [implicit_jscontext] - void setGCZeal(in long zeal); - - [implicit_jscontext] void nukeSandbox(in jsval obj); /* diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp index ca78234c9..dbb63092e 100644 --- a/js/xpconnect/src/XPCComponents.cpp +++ b/js/xpconnect/src/XPCComponents.cpp @@ -3005,15 +3005,6 @@ GENERATE_JSCONTEXTOPTION_GETTER_SETTER(Ion, ion, setIon) #undef GENERATE_JSCONTEXTOPTION_GETTER_SETTER NS_IMETHODIMP -nsXPCComponents_Utils::SetGCZeal(int32_t aValue, JSContext* cx) -{ -#ifdef JS_GC_ZEAL - JS_SetGCZeal(cx, uint8_t(aValue), JS_DEFAULT_ZEAL_FREQ); -#endif - return NS_OK; -} - -NS_IMETHODIMP nsXPCComponents_Utils::NukeSandbox(HandleValue obj, JSContext* cx) { PROFILER_LABEL_FUNC(js::ProfileEntry::Category::JS); diff --git a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp index 6981b525c..defd1b785 100644 --- a/js/xpconnect/src/XPCJSContext.cpp +++ b/js/xpconnect/src/XPCJSContext.cpp @@ -1473,16 +1473,6 @@ ReloadPrefsCallback(const char* pref, void* data) sExtraWarningsForSystemJS = Preferences::GetBool(JS_OPTIONS_DOT_STR "strict.debug"); #endif -#ifdef JS_GC_ZEAL - int32_t zeal = Preferences::GetInt(JS_OPTIONS_DOT_STR "gczeal", -1); - int32_t zeal_frequency = - Preferences::GetInt(JS_OPTIONS_DOT_STR "gczeal.frequency", - JS_DEFAULT_ZEAL_FREQ); - if (zeal >= 0) { - JS_SetGCZeal(cx, (uint8_t)zeal, zeal_frequency); - } -#endif // JS_GC_ZEAL - JS::ContextOptionsRef(cx).setBaseline(useBaseline) .setIon(useIon) .setAsmJS(useAsmJS) diff --git a/js/xpconnect/src/XPCShellImpl.cpp b/js/xpconnect/src/XPCShellImpl.cpp index d86b5c5d3..d9629bfed 100644 --- a/js/xpconnect/src/XPCShellImpl.cpp +++ b/js/xpconnect/src/XPCShellImpl.cpp @@ -440,21 +440,6 @@ GC(JSContext* cx, unsigned argc, Value* vp) return true; } -#ifdef JS_GC_ZEAL -static bool -GCZeal(JSContext* cx, unsigned argc, Value* vp) -{ - CallArgs args = CallArgsFromVp(argc, vp); - uint32_t zeal; - if (!ToUint32(cx, args.get(0), &zeal)) - return false; - - JS_SetGCZeal(cx, uint8_t(zeal), JS_DEFAULT_ZEAL_FREQ); - args.rval().setUndefined(); - return true; -} -#endif - static bool SendCommand(JSContext* cx, unsigned argc, Value* vp) { @@ -652,9 +637,6 @@ static const JSFunctionSpec glob_functions[] = { JS_FS("dumpXPC", DumpXPC, 1,0), JS_FS("dump", Dump, 1,0), JS_FS("gc", GC, 0,0), -#ifdef JS_GC_ZEAL - JS_FS("gczeal", GCZeal, 1,0), -#endif JS_FS("options", Options, 0,0), JS_FS("sendCommand", SendCommand, 1,0), JS_FS("atob", xpc::Atob, 1,0), |