Bug 899367 - Followup bustage fix for some functions that were renamed out from under me. r=me CLOSED TREE
authorBobby Holley <bobbyholley@gmail.com>
Wed, 04 Sep 2013 14:58:23 -0700
changeset 145528 5a86fde943e62e8656b8e5174e10de3ed1f3519a
parent 145527 746266548b657302dc9fab8f49ba84581e61e5b3
child 145529 7509132548d925670b3051c919f901b9b96dd619
push id33309
push userbobbyholley@gmail.com
push dateWed, 04 Sep 2013 21:58:54 +0000
treeherdermozilla-inbound@5a86fde943e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs899367
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 899367 - Followup bustage fix for some functions that were renamed out from under me. r=me CLOSED TREE
dom/base/nsJSEnvironment.cpp
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -869,17 +869,17 @@ nsJSContext::nsJSContext(bool aGCOnDestr
 
     // Watch for the JS boolean options
     Preferences::RegisterCallback(JSOptionChangedCallback,
                                   js_options_dot_str, this);
   }
   mIsInitialized = false;
   mScriptsEnabled = true;
   mProcessingScriptTag = false;
-  NS_HOLD_JS_OBJECTS(this, nsJSContext);
+  HoldJSObjects(this);
 }
 
 nsJSContext::~nsJSContext()
 {
   *mPrev = mNext;
   if (mNext) {
     mNext->mPrev = mPrev;
   }
@@ -920,17 +920,17 @@ nsJSContext::DestroyJSContext()
                                   js_options_dot_str, this);
 
   if (mGCOnDestruction) {
     PokeGC(JS::gcreason::NSJSCONTEXT_DESTROY);
   }
 
   JS_DestroyContextNoGC(mContext);
   mContext = nullptr;
-  NS_DROP_JS_OBJECTS(this, nsJSContext);
+  DropJSObjects(this);
 }
 
 // QueryInterface implementation for nsJSContext
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsJSContext)
 
 NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(nsJSContext)
   NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mWindowProxy)
 NS_IMPL_CYCLE_COLLECTION_TRACE_END