Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More detailed description of JS objects. b=414972 r+sr=peterv a=not part of default build (DEBUG_CC only)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@245248 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2008-02-08 19:50:47 +00:00
parent c01fc9c5b3
commit d9f25753a4
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/js/src/xpconnect/src/nsXPConnect.cpp
View File

@@ -749,6 +749,7 @@ nsXPConnect::Traverse(void *p, nsCycleCollectionTraversalCallback &cb)
CCNodeType type;
#ifdef DEBUG_CC
{
// Note that the conditions under which we specify GCMarked vs.
// GCUnmarked are different between ExplainLiveExpectedGarbage and
// the normal case. In the normal case, we're saying that anything
@@ -772,11 +773,11 @@ nsXPConnect::Traverse(void *p, nsCycleCollectionTraversalCallback &cb)
type = JS_IsAboutToBeFinalized(cx, p) ? GCUnmarked : GCMarked;
}
char name[72];
if(traceKind == JSTRACE_OBJECT)
{
JSObject *obj = static_cast<JSObject*>(p);
JSClass *clazz = OBJ_GET_CLASS(cx, obj);
char name[72];
if(XPCNativeWrapper::IsNativeWrapperClass(clazz))
{
XPCWrappedNative* wn = XPCNativeWrapper::GetWrappedNative(obj);
@@ -867,12 +868,33 @@ nsXPConnect::Traverse(void *p, nsCycleCollectionTraversalCallback &cb)
JS_snprintf(name, sizeof(name), "JS Object (%s)", clazz->name);
}
}
cb.DescribeNode(type, 0, sizeof(JSObject), name);
}
else
{
cb.DescribeNode(type, 0, sizeof(JSObject), "JS Object");
static const char trace_types[JSTRACE_LIMIT][10] = {
"Object",
"Double",
"String",
"Function",
"Namespace",
"Qname",
"Xml"
};
JS_snprintf(name, sizeof(name), "JS %s", trace_types[traceKind]);
}
if(traceKind == JSTRACE_OBJECT || traceKind == JSTRACE_NAMESPACE ||
traceKind == JSTRACE_QNAME || traceKind == JSTRACE_XML) {
JSObject *global = static_cast<JSObject*>(p), *parent;
while((parent = JS_GetParent(cx, global)))
global = parent;
char fullname[100];
JS_snprintf(fullname, sizeof(fullname), "%s (global=%p)", name, global);
cb.DescribeNode(type, 0, sizeof(JSObject), fullname);
} else {
cb.DescribeNode(type, 0, sizeof(JSObject), name);
}
}
#else
type = JS_IsAboutToBeFinalized(cx, p) ? GCUnmarked : GCMarked;