Bug 677079 - Part aa: Expose sizeof(JSContext) in jsfriendapi.h; r=njn

js/src/jsfriendapi.cpp

@@ -607,4 +607,10 @@ GetContextStackLimit(const JSContext *cx)
     return cx->stackLimit;
 }
 
+JS_FRIEND_API(size_t)
+SizeOfJSContext()
+{
+    return sizeof(JSContext);
+}
+
 } // namespace js

js/src/jsfriendapi.h

@@ -562,6 +562,9 @@ typedef Vector<JSCompartment*, 0, SystemAllocPolicy> CompartmentVector;
 extern JS_FRIEND_API(const CompartmentVector&)
 GetRuntimeCompartments(JSRuntime *rt);
 
+extern JS_FRIEND_API(size_t)
+SizeOfJSContext();
+
 } /* namespace js */
 
 /*

js/xpconnect/src/nsXPConnect.cpp

@@ -69,8 +69,6 @@
 
 #include "nsWrapperCacheInlines.h"
 
-#include "jscntxt.h" // sizeof(JSContext)
-
 NS_IMPL_THREADSAFE_ISUPPORTS7(nsXPConnect,
                               nsIXPConnect,
                               nsISupportsWeakReference,
@@ -1002,7 +1000,7 @@ public:
         // edges will ensure that any cycles this context is in won't be
         // collected.
         unsigned refCount = nsXPConnect::GetXPConnect()->GetOutstandingRequests(cx) + 1;
-        NS_IMPL_CYCLE_COLLECTION_DESCRIBE(JSContext, refCount)
+        cb.DescribeRefCountedNode(refCount, js::SizeOfJSContext(), "JSContext");
         NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "[global object]");
         if (JSObject *global = JS_GetGlobalObject(cx)) {
             cb.NoteScriptChild(nsIProgrammingLanguage::JAVASCRIPT, global);