From 9194f7a1d2851b30236623a6b3b2d87b89a31dd5 Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Wed, 13 Feb 2013 00:22:26 +0100 Subject: [PATCH] Bug 834732 - Make SafeAutoJSContext actually push something. r=mrbkap Currently it never does, because the SafeJSContext doesn't have an nsIScriptContext behind it. :-( --- content/base/src/nsContentUtils.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp index ee6bb56c0b2..10eff757390 100644 --- a/content/base/src/nsContentUtils.cpp +++ b/content/base/src/nsContentUtils.cpp @@ -6855,9 +6855,7 @@ AutoJSContext::Init(bool aSafe MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL) if (!mCx) { mCx = nsContentUtils::GetSafeJSContext(); - // XXXbholley - This is totally wrong, but necessary to make this patch - // not change any behavior. We'll fix it in an upcoming patch. - bool result = mPusher.Push(mCx, nsCxPusher::REQUIRE_SCRIPT_CONTEXT); + bool result = mPusher.Push(mCx, nsCxPusher::ALWAYS_PUSH); if (!result || !mCx) { MOZ_CRASH(); }