From d1662b907739bfb51ae1643fbf0a17cf84052510 Mon Sep 17 00:00:00 2001 From: Robert Sayre Date: Fri, 6 Aug 2010 18:15:51 -0700 Subject: [PATCH] =?UTF-8?q?Backed=20out=20changeset=20504bc84513b0.=20Andr?= =?UTF-8?q?eas=20Gal=20=E2=80=93=20Ensure=20that=20JSOPTION=5FUNROOTED=5FG?= =?UTF-8?q?LOBAL=20is=20set=20when=20we=20cycle=20collect=20(stop-gap=20me?= =?UTF-8?q?asure=20for=20bug=20584495,=20r=3Dbrendan).=20default=20tip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/src/xpconnect/src/xpcjsruntime.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/js/src/xpconnect/src/xpcjsruntime.cpp b/js/src/xpconnect/src/xpcjsruntime.cpp index ee55f2055bc..04ef222cb2e 100644 --- a/js/src/xpconnect/src/xpcjsruntime.cpp +++ b/js/src/xpconnect/src/xpcjsruntime.cpp @@ -498,15 +498,6 @@ JSBool XPCJSRuntime::GCCallback(JSContext *cx, JSGCStatus status) { return JS_FALSE; } - - // We seem to sometime lose the unrooted global flag. Restore it - // here. FIXME: bug 584495. - JSContext *iter = nsnull, *acx; - - while((acx = JS_ContextIterator(GetJSRuntime(), &iter))) { - if (!JS_HAS_OPTION(acx, JSOPTION_UNROOTED_GLOBAL)) - JS_ToggleOptions(acx, JSOPTION_UNROOTED_GLOBAL); - } break; } case JSGC_MARK_END: