diff options
| -rw-r--r-- | js/src/builtin/TestingFunctions.cpp | 2 | ||||
| -rw-r--r-- | js/src/gc/Nursery.h | 2 | ||||
| -rw-r--r-- | js/src/tests/shell.js | 15 | ||||
| -rw-r--r-- | js/xpconnect/idl/xpccomponents.idl | 5 | ||||
| -rw-r--r-- | js/xpconnect/src/XPCComponents.cpp | 6 | ||||
| -rw-r--r-- | testing/specialpowers/content/specialpowersAPI.js | 4 |
6 files changed, 1 insertions, 33 deletions
diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp index 6765a05f36..acf449b7e5 100644 --- a/js/src/builtin/TestingFunctions.cpp +++ b/js/src/builtin/TestingFunctions.cpp @@ -1264,8 +1264,6 @@ OOMTest(JSContext* cx, unsigned argc, Value* vp) MOZ_ASSERT(!cx->isExceptionPending()); rt->hadOutOfMemory = false; - JS_SetGCZeal(cx, 0, JS_DEFAULT_ZEAL_FREQ); - for (unsigned thread = threadStart; thread < threadEnd; thread++) { if (verbose) fprintf(stderr, "thread %d\n", thread); diff --git a/js/src/gc/Nursery.h b/js/src/gc/Nursery.h index 9195e024dc..0d215d9975 100644 --- a/js/src/gc/Nursery.h +++ b/js/src/gc/Nursery.h @@ -58,8 +58,6 @@ class NativeObject; class Nursery; class HeapSlot; -void SetGCZeal(JSRuntime*, uint8_t, uint32_t); - namespace gc { class AutoMaybeStartBackgroundAllocation; struct Cell; diff --git a/js/src/tests/shell.js b/js/src/tests/shell.js index 36dbc79dae..c7a57953ee 100644 --- a/js/src/tests/shell.js +++ b/js/src/tests/shell.js @@ -32,8 +32,6 @@ // Certain cached functionality only exists (and is only needed) when // running in the browser. Segregate that caching here. - var SpecialPowersSetGCZeal = - global.SpecialPowers ? global.SpecialPowers.setGCZeal : undefined; } var runningInShell = typeof window === "undefined"; @@ -205,19 +203,6 @@ global.quit = quit; } - var gczeal = global.gczeal; - if (typeof gczeal !== "function") { - if (typeof SpecialPowersSetGCZeal === "function") { - gczeal = function gczeal(z) { - SpecialPowersSetGCZeal(z); - }; - } else { - gczeal = function() {}; // no-op if not available - } - - global.gczeal = gczeal; - } - /****************************************************** * TEST METADATA EXPORTS (these are of dubious value) * ******************************************************/ diff --git a/js/xpconnect/idl/xpccomponents.idl b/js/xpconnect/idl/xpccomponents.idl index 711ea4c642..611091c4bd 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 02b0b4d148..dbb63092ed 100644 --- a/js/xpconnect/src/XPCComponents.cpp +++ b/js/xpconnect/src/XPCComponents.cpp @@ -3005,12 +3005,6 @@ GENERATE_JSCONTEXTOPTION_GETTER_SETTER(Ion, ion, setIon) #undef GENERATE_JSCONTEXTOPTION_GETTER_SETTER NS_IMETHODIMP -nsXPCComponents_Utils::SetGCZeal(int32_t aValue, JSContext* cx) -{ - return NS_OK; -} - -NS_IMETHODIMP nsXPCComponents_Utils::NukeSandbox(HandleValue obj, JSContext* cx) { PROFILER_LABEL_FUNC(js::ProfileEntry::Category::JS); diff --git a/testing/specialpowers/content/specialpowersAPI.js b/testing/specialpowers/content/specialpowersAPI.js index ee94e84a30..8f1ff7465c 100644 --- a/testing/specialpowers/content/specialpowersAPI.js +++ b/testing/specialpowers/content/specialpowersAPI.js @@ -1479,10 +1479,6 @@ SpecialPowersAPI.prototype = { Cu.schedulePreciseGC(genGCCallback(callback)); }, - setGCZeal: function(zeal) { - Cu.setGCZeal(zeal); - }, - isMainProcess: function() { try { return Cc["@mozilla.org/xre/app-info;1"]. |