From b1e77d43cc4a1564bfafb4e27316d61fc3eed872 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Sat, 29 Jun 2013 18:44:03 -0600
Subject: [PATCH] Bug 865745 - Stop depending on mCx during frame script
 execution. r=smaug

---
 content/base/src/nsFrameMessageManager.cpp | 29 +++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/content/base/src/nsFrameMessageManager.cpp b/content/base/src/nsFrameMessageManager.cpp
index e77f8b6ac70..18579eda026 100644
--- a/content/base/src/nsFrameMessageManager.cpp
+++ b/content/base/src/nsFrameMessageManager.cpp
@@ -995,7 +995,7 @@ nsFrameScriptExecutor::Shutdown()
 void
 nsFrameScriptExecutor::LoadFrameScriptInternal(const nsAString& aURL)
 {
-  if (!mGlobal || !mCx || !sCachedScripts) {
+  if (!mGlobal || !sCachedScripts) {
     return;
   }
 
@@ -1006,11 +1006,11 @@ nsFrameScriptExecutor::LoadFrameScriptInternal(const nsAString& aURL)
   }
 
   if (holder) {
-    nsCxPusher pusher;
-    pusher.Push(mCx);
-    JS::Rooted<JSObject*> global(mCx, mGlobal->GetJSObject());
+    AutoSafeJSContext cx;
+    JS::Rooted<JSObject*> global(cx, mGlobal->GetJSObject());
     if (global) {
-      (void) JS_ExecuteScript(mCx, global, holder->mScript, nullptr);
+      JSAutoCompartment ac(cx, global);
+      (void) JS_ExecuteScript(cx, global, holder->mScript, nullptr);
     }
   }
 }
@@ -1059,18 +1059,17 @@ nsFrameScriptExecutor::TryCacheLoadAndCompileScript(const nsAString& aURL,
   }
 
   if (!dataString.IsEmpty()) {
-    nsCxPusher pusher;
-    pusher.Push(mCx);
-    JS::Rooted<JSObject*> global(mCx, mGlobal->GetJSObject());
+    AutoSafeJSContext cx;
+    JS::Rooted<JSObject*> global(cx, mGlobal->GetJSObject());
     if (global) {
-      JSAutoCompartment ac(mCx, global);
-      JS::CompileOptions options(mCx);
+      JSAutoCompartment ac(cx, global);
+      JS::CompileOptions options(cx);
       options.setNoScriptRval(true)
              .setFileAndLine(url.get(), 1)
              .setPrincipals(nsJSPrincipals::get(mPrincipal));
-      JS::RootedObject empty(mCx, nullptr);
-      JS::Rooted<JSScript*> script(mCx,
-        JS::Compile(mCx, empty, options, dataString.get(),
+      JS::RootedObject empty(cx, nullptr);
+      JS::Rooted<JSScript*> script(cx,
+        JS::Compile(cx, empty, options, dataString.get(),
                     dataString.Length()));
 
       if (script) {
@@ -1081,11 +1080,11 @@ nsFrameScriptExecutor::TryCacheLoadAndCompileScript(const nsAString& aURL,
           nsFrameJSScriptExecutorHolder* holder =
             new nsFrameJSScriptExecutorHolder(script);
           // Root the object also for caching.
-          JS_AddNamedScriptRoot(mCx, &(holder->mScript),
+          JS_AddNamedScriptRoot(cx, &(holder->mScript),
                                 "Cached message manager script");
           sCachedScripts->Put(aURL, holder);
         } else if (aBehavior == EXECUTE_IF_CANT_CACHE) {
-          (void) JS_ExecuteScript(mCx, global, script, nullptr);
+          (void) JS_ExecuteScript(cx, global, script, nullptr);
         }
       }
     }