Merge. a=red
authorJosh Matthews <josh@joshmatthews.net>
Tue, 23 Nov 2010 16:07:20 -0500
changeset 58098 2801d173e385c0e6010098d5fa952c38af072700
parent 58096 5538d32b4faef4b751c7825f1c18582553fb759b (current diff)
parent 58097 3dee85f9ce3a84613261de0ec83301ddf83ddf5f (diff)
child 58099 ac613052b58fe04152759956710dd49efcadf025
push id17154
push userjmatthews@mozilla.com
push dateTue, 23 Nov 2010 21:07:31 +0000
treeherdermozilla-central@2801d173e385 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersred
milestone2.0b8pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge. a=red
--- a/ipc/testshell/XPCShellEnvironment.cpp
+++ b/ipc/testshell/XPCShellEnvironment.cpp
@@ -422,33 +422,16 @@ GC(JSContext *cx,
            );
 #ifdef JS_GCMETER
     js_DumpGCStats(rt, stdout);
 #endif
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
     return JS_TRUE;
 }
 
-#ifdef JS_GC_ZEAL
-static JSBool
-GCZeal(JSContext *cx,
-       JSObject *obj,
-       uintN argc,
-       jsval *argv,
-       jsval *rval)
-{
-  uint32 zeal;
-  if (!JS_ValueToECMAUint32(cx, argv[0], &zeal))
-    return JS_FALSE;
-
-  JS_SetGCZeal(cx, (PRUint8)zeal);
-  return JS_TRUE;
-}
-#endif
-
 #ifdef DEBUG
 
 static JSBool
 DumpHeap(JSContext *cx,
          uintN argc,
          jsval *vp)
 {
     JSAutoByteString fileName;
@@ -553,19 +536,16 @@ JSFunctionSpec gGlobalFunctions[] =
     {"print",           Print,          0,0},
     {"load",            Load,           1,0},
     {"quit",            Quit,           0,0},
     {"version",         Version,        1,0},
     {"build",           BuildDate,      0,0},
     {"dumpXPC",         DumpXPC,        1,0},
     {"dump",            Dump,           1,0},
     {"gc",              GC,             0,0},
-#ifdef JS_GC_ZEAL
-    {"gczeal",          GCZeal,         1,0},
-#endif
     {"clear",           Clear,          1,0},
 #ifdef DEBUG
     {"dumpHeap",        DumpHeap,       5,0},
 #endif
 #ifdef MOZ_SHARK
     {"startShark",      js_StartShark,      0,0},
     {"stopShark",       js_StopShark,       0,0},
     {"connectShark",    js_ConnectShark,    0,0},