From ad7b144c59c3415afe42aed6b968d9ec7201c2ed Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Wed, 13 Jul 2011 15:43:31 -0700
Subject: [PATCH] Bug 670205 - Preserve JSOPTION_UNROOTED_GLOBAL in
 ContextHolder::ContextHolder (r=gal)

---
 js/src/xpconnect/src/xpccomponents.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/src/xpconnect/src/xpccomponents.cpp b/js/src/xpconnect/src/xpccomponents.cpp
index b0480a4b5578..a7c30e915ae4 100644
--- a/js/src/xpconnect/src/xpccomponents.cpp
+++ b/js/src/xpconnect/src/xpccomponents.cpp
@@ -3412,6 +3412,7 @@ ContextHolder::ContextHolder(JSContext *aOuterCx, JSObject *aSandbox)
     {
         JSAutoRequest ar(mJSContext);
         JS_SetOptions(mJSContext,
+                      JS_GetOptions(mJSContext) |
                       JSOPTION_DONT_REPORT_UNCAUGHT |
                       JSOPTION_PRIVATE_IS_NSISUPPORTS);
         JS_SetGlobalObject(mJSContext, aSandbox);