diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h index da7304faaaab..80cfb1454872 100644 --- a/js/xpconnect/src/xpcprivate.h +++ b/js/xpconnect/src/xpcprivate.h @@ -1065,9 +1065,12 @@ public: static void TraceWrappedNativesInAllScopes(JSTracer* trc, XPCJSRuntime* rt); - void TraceInside(JSTracer *trc) { + void TraceSelf(JSTracer *trc) { MOZ_ASSERT(mGlobalJSObject); mGlobalJSObject.trace(trc, "XPCWrappedNativeScope::mGlobalJSObject"); + } + + void TraceInside(JSTracer *trc) { if (mContentXBLScope) mContentXBLScope.trace(trc, "XPCWrappedNativeScope::mXBLScope"); for (size_t i = 0; i < mAddonScopes.Length(); i++) @@ -1847,7 +1850,7 @@ public: mScriptableInfo->Mark(); } - GetScope()->TraceInside(trc); + GetScope()->TraceSelf(trc); } void TraceJS(JSTracer *trc) { @@ -2162,7 +2165,7 @@ public: if (HasProto()) GetProto()->TraceSelf(trc); else - GetScope()->TraceInside(trc); + GetScope()->TraceSelf(trc); if (mFlatJSObject && JS_IsGlobalObject(mFlatJSObject)) { xpc::TraceXPCGlobal(trc, mFlatJSObject);