From 762638238db6a73906a10e61d59f5d60b650712b Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 22 May 2013 10:05:23 -0600
Subject: [PATCH] Bug 868130 - Make sure the new cx is stack-top in
 nsFrameMessageManager. r=gabor

---
 content/base/src/nsFrameMessageManager.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/content/base/src/nsFrameMessageManager.cpp b/content/base/src/nsFrameMessageManager.cpp
index 5ea160a2442b..e9caf745e275 100644
--- a/content/base/src/nsFrameMessageManager.cpp
+++ b/content/base/src/nsFrameMessageManager.cpp
@@ -1111,8 +1111,9 @@ nsFrameScriptExecutor::InitTabChildGlobalInternal(nsISupports* aScope,
   runtimeSvc->GetRuntime(&rt);
   NS_ENSURE_TRUE(rt, false);
 
-  JSContext* cx = JS_NewContext(rt, 8192);
-  NS_ENSURE_TRUE(cx, false);
+  JSContext* cx_ = JS_NewContext(rt, 8192);
+  NS_ENSURE_TRUE(cx_, false);
+  AutoPushJSContext cx(cx_);
 
   mCx = cx;