More types!

tools/trace-malloc/types.dat

@@ -31,6 +31,13 @@
 # Where Stack1...StackN imply that the object's type is
 # InferredType. Note that in many cases, we'll ``roll up'' storage
 # that's part of an object's implementation into the object itself.
+#
+
+# Here's a handy regexp for cleaning up strings copied from the
+# uncategorized file:
+#
+#   \(^ *([0-9]+) \|\[.*\]$\)
+#
 
 #----------------------------------------------------------------------
 # Unclassified JavaScript allocations
@@ -101,6 +108,12 @@ js_InitGC
 <JS-unclassified>
 js_GC
 
+<JS-GC-roots>
+JS_DHashAllocTable
+JS_DHashTableFinish
+JS_DHashTableOperate
+js_AddRootRT
+
 <JS-GC-arena>
 JS_ArenaAllocate
 ~.*
@@ -161,6 +174,11 @@ js_NewArrayObject
 JS_malloc
 js_NewFunction
 
+<JS-function>
+JS_malloc
+js_NewObject
+js_CloneFunctionObject
+
 <JS-function>
 JS_malloc
 js_NewObject
@@ -384,6 +402,13 @@ nsCSSRule::operator new(unsigned int)
 __builtin_new
 CSSRuleProcessor::GetRuleCascade(nsIAtom *)
 
+<CSSRuleProcessor>
+PR_Realloc
+nsVoidArray::SizeTo(int)
+nsVoidArray::GrowArrayBy(int)
+nsVoidArray::InsertElementAt(void *, int)
+CSSRuleProcessor::ClearRuleCascades(void)
+
 <CSSRuleProcessor>
 PR_Malloc
 PL_HashTableFinalize(PLHashTable *)
@@ -422,7 +447,7 @@ PL_HashTableFinalize(PLHashTable *)
 PL_HashTableInit(PLHashTable *, unsigned int, unsigned int (*)(void const *), int (*)(void const *, void const *), int (*)(void const *, void const *), PLHashAllocOps const *, void *)
 nsHashtable::nsHashtable(unsigned int, int)
 nsRuleNode::Transition(nsIStyleRule *, nsIRuleNode **)
-nsRuleWalker::Forward(nsIStyleRule *)[dist/bin/mozilla-bin +0x7E31B1]
+nsRuleWalker::Forward(nsIStyleRule *)
 CSSRuleProcessor::RulesMatching(nsIPresContext *, nsIAtom *, nsIContent *, nsIStyleContext *, nsIRuleWalker *)
 
 <CSSRuleProcessor>
@@ -580,6 +605,21 @@ nsXULAttributes::Create(nsIContent *, nsXULAttributes **)
 __builtin_new
 nsXULElement::Create(nsINodeInfo *, nsIContent **)
 
+<nsXULElement>
+PR_Realloc
+nsVoidArray::SizeTo(int)
+nsAutoVoidArray::SizeTo(int)
+nsVoidArray::GrowArrayBy(int)
+nsVoidArray::InsertElementAt(void *, int)
+nsXULElement::EnsureSlots(void)
+
+<nsXULElement>
+PR_Realloc
+nsVoidArray::SizeTo(int)
+nsVoidArray::GrowArrayBy(int)
+nsVoidArray::InsertElementAt(void *, int)
+nsXULElement::AppendChildTo(nsIContent *, int, int)
+
 <nsXULElement>
 __builtin_new
 nsXULElement::EnsureSlots(void)
@@ -591,12 +631,35 @@ nsVoidArray::GrowArrayBy(int)
 nsVoidArray::InsertElementAt(void *, int)
 nsXULElement::AppendChildTo(nsIContent *, int, int)
 
+<nsXULElement>
+PR_Malloc
+nsVoidArray::SizeTo(int)
+nsAutoVoidArray::SizeTo(int)
+nsVoidArray::GrowArrayBy(int)
+nsVoidArray::InsertElementAt(void *, int)
+nsXULElement::EnsureSlots(void)
+
+<nsXULElement>
+PR_Malloc
+nsVoidArray::SizeTo(int)
+nsVoidArray::GrowArrayBy(int)
+nsVoidArray::InsertElementAt(void *, int)
+nsXULElement::AddBroadcastListener(nsAString const &, nsIDOMElement *)
+
 <sscanf>
 iconv_close
 
 <sscanf>
 tsearch
 
+<CSSDeclarationImpl>
+PR_Realloc
+nsVoidArray::SizeTo(int)
+nsAutoVoidArray::SizeTo(int)
+nsVoidArray::GrowArrayBy(int)
+nsVoidArray::InsertElementAt(void *, int)
+CSSDeclarationImpl::AppendValue(nsCSSProperty, nsCSSValue const &)
+
 <CSSDeclarationImpl>
 __builtin_new
 CSSDeclarationImpl::AppendValue(nsCSSProperty, nsCSSValue const &)
@@ -678,6 +741,12 @@ __builtin_new
 __builtin_vec_new
 InMemoryDataSource::AllocTable(void *, unsigned int)
 
+<InMemoryDataSource>
+PL_DHashAllocTable
+PL_DHashTableFinish
+PL_DHashTableOperate
+InMemoryDataSource::LockedAssert(nsIRDFResource *, nsIRDFResource *, nsIRDFNode *, int)
+
 <InMemoryDataSource>
 PR_Malloc
 PL_ArenaAllocate
@@ -867,6 +936,22 @@ __builtin_vec_new
 new_str(char const *)
 nsPluginTag::nsPluginTag(char const *, char const *, char const *, char const *const *, char const *const *, char const *const *, int)
 
+<nsXBLInsertionPoint>
+__builtin_new
+__builtin_vec_new
+nsSupportsArray::GrowArrayBy(int)
+nsSupportsArray::InsertElementAt(nsISupports *, unsigned int)
+nsSupportsArray::AppendElement(nsISupports *)
+nsXBLInsertionPoint::AddChild(nsIContent *)
+
+<nsXBLPrototypeBinding>
+PR_Malloc
+PL_HashTableFinalize(PLHashTable *)
+PL_HashTableRawAdd
+nsHashtable::Put(nsHashKey *, void *)
+nsSupportsHashtable::Put(nsHashKey *, nsISupports *, nsISupports **)
+nsXBLPrototypeBinding::ConstructInsertionTable(nsIContent *)
+
 <nsXBLPrototypeBinding>
 PR_Malloc
 PL_ArenaAllocate
@@ -945,6 +1030,14 @@ nsHashtable::nsHashtable(unsigned int, int)
 nsSupportsHashtable::nsSupportsHashtable(unsigned int, int)
 PresShell::SetAnonymousContentFor(nsIContent *, nsISupportsArray *)
 
+<StackArena>
+PR_Malloc
+StackArena::StackArena(void)
+
+<StackArena
+PR_Malloc
+StackArena::Allocate(unsigned int, void **)
+
 <StackArena>
 PR_Malloc
 StackBlock::StackBlock(void)
@@ -992,6 +1085,28 @@ __builtin_new
 nsDST::NewMemoryArena(unsigned int)
 FrameManager::Init(nsIPresShell *, nsIStyleSet *)
 
+<FrameManager>
+PR_Malloc
+PL_ArenaAllocate
+nsDST::NodeArena::AllocTwoNode(void)
+nsDST::ConvertToTwoNode(nsDST::LeafNode **)
+nsDST::Insert(void *, void *, void **)
+FrameManager::SetPrimaryFrameFor(nsIContent *, nsIFrame *)
+
+<FrameManager>
+PR_Malloc
+PL_ArenaAllocate
+nsDST::NodeArena::AllocLeafNode(void)
+nsDST::Insert(void *, void *, void **)
+FrameManager::SetFrameProperty(nsIFrame *, nsIAtom *, void *, void (*)(nsIPresContext *, nsIFrame *, nsIAtom *, void *))
+
+<FrameManager>
+PR_Malloc
+PL_ArenaAllocate
+nsDST::NodeArena::AllocLeafNode(void)
+nsDST::Insert(void *, void *, void **)
+FrameManager::SetPrimaryFrameFor(nsIContent *, nsIFrame *)
+
 <UndisplayedMap>
 PR_Malloc
 PL_ArenaFinish
@@ -1311,6 +1426,40 @@ basic_nsAWritableString<unsigned short>::Assign(basic_nsAReadableString<unsigned
 nsString::nsString(basic_nsAReadableString<unsigned short> const &)
 nsDOMDocumentType::nsDOMDocumentType(basic_nsAReadableString<unsigned short> const &, nsIDOMNamedNodeMap *, nsIDOMNamedNodeMap *, basic_nsAReadableString<unsigned short> const &, basic_nsAReadableString<unsigned short> const &, basic_nsAReadableString<unsigned short> const &)
 
+<nsXPCWrappedJS>
+JS_DHashAllocTable
+JS_DHashTableFinish
+JS_DHashTableOperate
+nsXPCWrappedJS::GetNewOrUsed(XPCCallContext &, JSObject *, nsID const &, nsISupports *, nsXPCWrappedJS **)
+
+<XPCWrappedNativeProto>
+JS_DHashAllocTable
+JS_DHashTableFinish
+JS_DHashTableOperate
+XPCWrappedNativeProto::GetNewOrUsed(XPCCallContext &, XPCWrappedNativeScope *, nsIClassInfo *, XPCNativeScriptableCreateInfo const *, int)
+
+<XPCWrappedNative>
+JS_malloc
+js_NewObject
+JS_NewObject
+XPCWrappedNative::Init(XPCCallContext &, JSObject *, XPCNativeScriptableCreateInfo const *)
+
+<XPCWrappedNative>
+JS_DHashAllocTable
+JS_DHashTableFinish
+JS_DHashTableOperate
+XPCWrappedNative::~XPCWrappedNative(void)
+
+<XPCWrappedNative>
+__builtin_new
+XPCWrappedNative::FindTearOff(XPCCallContext &, XPCNativeInterface *, int, unsigned int *)
+
+<XPCWrappedNative>
+JS_DHashAllocTable
+JS_DHashTableFinish
+JS_DHashTableOperate
+XPCWrappedNative::GetNewOrUsed(XPCCallContext &, nsISupports *, XPCWrappedNativeScope *, XPCNativeInterface *, XPCWrappedNative **)
+
 <nsXPCWrappedNativeClass>
 __builtin_new
 __builtin_vec_new
@@ -1689,6 +1838,14 @@ nsZipReaderCache::nsZipReaderCache(void)
 __builtin_new
 nsZipReaderCache::GetZip(nsIFile *, nsIZipReader **)
 
+<nsXBLDocumentInfo>
+PR_Malloc
+PL_HashTableFinalize(PLHashTable *)
+PL_HashTableRawAdd
+nsHashtable::Put(nsHashKey *, void *)
+nsSupportsHashtable::Put(nsHashKey *, nsISupports *, nsISupports **)
+nsXBLDocumentInfo::SetPrototypeBinding(nsACString const &, nsIXBLPrototypeBinding *)
+
 <nsXBLDocumentInfo>
 __builtin_new
 nsCStringKey::Clone(void) const
@@ -1907,6 +2064,14 @@ nsStringBundleService::insertIntoCache(nsIStringBundle *, nsCStringKey *)
 __builtin_new
 CSSStyleSheetImpl::CSSStyleSheetImpl(void)
 
+<CSSStyleSheetImpl>
+__builtin_new
+__builtin_vec_new
+nsSupportsArray::GrowArrayBy(int)
+nsSupportsArray::InsertElementAt(nsISupports *, unsigned int)
+nsSupportsArray::AppendElement(nsISupports *)
+CSSStyleSheetImpl::AppendStyleRule(nsICSSRule *)
+
 <CSSStyleSheetImpl>
 PR_Malloc
 PL_HashTableFinalize(PLHashTable *)
@@ -2045,6 +2210,23 @@ nsAttrSelector::nsAttrSelector(nsAttrSelector const &)
 nsAttrSelector::nsAttrSelector(nsAttrSelector const &)
 nsCSSSelector::nsCSSSelector(nsCSSSelector const &)
 
+<StyleSetImpl>
+__builtin_new
+CSSStyleSheetImpl::GetStyleRuleProcessor(nsIStyleRuleProcessor *&, nsIStyleRuleProcessor *)
+StyleSetImpl::ClearOverrideRuleProcessors(void)
+
+<StyleSetImpl>
+__builtin_new
+CSSRuleProcessor::GetRuleCascade(nsIPresContext *, nsIAtom *)
+CSSRuleProcessor::RulesMatching(nsIPresContext *, nsIAtom *, nsIContent *, nsIStyleContext *, nsIRuleWalker *)
+StyleSetImpl::ReplaceBackstopStyleSheets(nsISupportsArray *)
+
+<StyleSetImpl>
+__builtin_new
+CSSRuleProcessor::GetRuleCascade(nsIPresContext *, nsIAtom *)
+CSSRuleProcessor::RulesMatching(nsIPresContext *, nsIAtom *, nsIContent *, nsIAtom *, nsIStyleContext *, nsICSSPseudoComparator *, nsIRuleWalker *)
+StyleSetImpl::ResolveStyleFor(nsIPresContext *, nsIContent *, nsIStyleContext *, int)
+
 <StyleSetImpl>
 __builtin_new
 nsSupportsArray::Create(nsISupports *, nsID const &, void **)
@@ -2368,6 +2550,13 @@ PL_ArenaAllocate
 nsFixedSizeAllocator::Alloc(unsigned int)
 InMemoryAssertionEnumeratorImpl::operator new(unsigned int, nsFixedSizeAllocator &)
 
+<nsGenericModule>
+PR_Malloc
+PL_HashTableFinalize(PLHashTable *)
+PL_HashTableInit(PLHashTable *, unsigned int, unsigned int (*)(void const *), int (*)(void const *, void const *), int (*)(void const *, void const *), PLHashAllocOps const *, void *)
+nsHashtable::nsHashtable(unsigned int, int)
+nsGenericModule::nsGenericModule(char const *, unsigned int, nsModuleComponentInfo *, unsigned int (*)(nsIModule *), void (*)(nsIModule *))
+
 <nsGenericModule>
 PR_Malloc
 PL_HashTableFinalize(PLHashTable *)
@@ -2528,6 +2717,23 @@ nsCheapVoidArray::SwitchToVector(void)
 nsCheapVoidArray::AppendElement(void *)
 nsGenericContainerElement::AppendChildTo(nsIContent *, int)
 
+<nsGenericContainerElement>
+PR_Realloc
+nsVoidArray::SizeTo(int)
+nsAutoVoidArray::SizeTo(int)
+nsVoidArray::GrowArrayBy(int)
+nsVoidArray::InsertElementAt(void *, int)
+nsCheapVoidArray::AppendElement(void *)
+nsGenericContainerElement::AppendChildTo(nsIContent *, int, int)
+
+<nsObserverService>
+PR_Malloc
+PL_HashTableFinalize(PLHashTable *)
+PL_HashTableInit(PLHashTable *, unsigned int, unsigned int (*)(void const *), int (*)(void const *, void const *), int (*)(void const *, void const *), PLHashAllocOps const *, void *)
+nsHashtable::nsHashtable(unsigned int, int)
+nsObjectHashtable::nsObjectHashtable(void *(*)(nsHashKey *, void *, void *), void *, int (*)(nsHashKey *, void *, void *), void *, unsigned int, int)
+nsObserverService::GetObserverList(unsigned short const *, nsIObserverList **)
+
 <nsObserverService>
 __builtin_new
 nsStringKey::Clone(void) const
@@ -2562,6 +2768,22 @@ nsObserverService::GetObserverList(nsString const &, nsIObserverList **)
 __builtin_new
 nsViewManager2::AddToDisplayList(int *, nsIView *, nsRect &, nsRect &, unsigned int, int, int)
 
+<nsBindingManager>
+PR_Malloc
+PL_HashTableFinalize(PLHashTable *)
+PL_HashTableRawAdd
+nsHashtable::Put(nsHashKey *, void *)
+nsSupportsHashtable::Put(nsHashKey *, nsISupports *, nsISupports **)
+nsBindingManager::SetContentListFor(nsIContent *, nsISupportsArray *)
+
+<nsBindingManager>
+PR_Malloc
+PL_HashTableFinalize(PLHashTable *)
+PL_HashTableRawAdd
+nsHashtable::Put(nsHashKey *, void *)
+nsSupportsHashtable::Put(nsHashKey *, nsISupports *, nsISupports **)
+nsBindingManager::SetAnonymousNodesFor(nsIContent *, nsISupportsArray *)
+
 <nsBindingManager>
 __builtin_new
 nsISupportsKey::Clone(void) const
@@ -2689,6 +2911,14 @@ nsDocument::Init(void)
 __builtin_new
 nsDocument::SetHeaderData(nsIAtom *, basic_nsAReadableString<unsigned short> const &)
 
+<nsDocument::mContentWrapperHash>
+PR_Malloc
+PL_HashTableFinalize(PLHashTable *)
+PL_HashTableRawAdd
+nsHashtable::Put(nsHashKey *, void *)
+nsSupportsHashtable::Put(nsHashKey *, nsISupports *, nsISupports **)
+nsDocument::AddReference(void *, nsISupports *)
+
 <nsDocHeaderData>
 PR_Malloc
 nsMemoryImpl::Alloc(unsigned int)
@@ -2720,6 +2950,46 @@ nsHashtable::nsHashtable(unsigned int, int)
 nsSupportsHashtable::nsSupportsHashtable(unsigned int, int)
 nsEventQueueServiceImpl::nsEventQueueServiceImpl(void)
 
+<nsEventListenerManager>
+PR_Realloc
+nsVoidArray::SizeTo(int)
+nsAutoVoidArray::SizeTo(int)
+nsVoidArray::GrowArrayBy(int)
+nsVoidArray::InsertElementAt(void *, int)
+nsEventListenerManager::AddEventListener(nsIDOMEventListener *, EventArrayType, int, nsHashKey *, int)
+
+<nsEventListenerManager>
+PR_Malloc
+nsEventListenerManager::AddEventListener(nsIDOMEventListener *, EventArrayType, int, nsHashKey *, int)
+nsEventListenerManager::SetJSEventListener(nsIScriptContext *, nsISupports *, nsIAtom *, int)
+nsEventListenerManager::AddScriptEventListener(nsIScriptContext *, nsISupports *, nsIAtom *, nsAString const &, int)
+
+<nsEventListenerManager>
+PR_Malloc
+nsEventListenerManager::AddEventListener(nsIDOMEventListener *, EventArrayType, int, nsHashKey *, int)
+nsEventListenerManager::AddEventListenerByType(nsIDOMEventListener *, nsAString const &, int)
+
+<nsEventListenerManager>
+PR_Malloc
+nsEventListenerManager::AddEventListener(nsIDOMEventListener *, EventArrayType, int, nsHashKey *, int)
+nsEventListenerManager::AddEventListenerByIID(nsIDOMEventListener *, nsID const &, int)
+
+<nsEventListenerManager>
+PR_Malloc
+nsVoidArray::SizeTo(int)
+nsAutoVoidArray::SizeTo(int)
+nsVoidArray::GrowArrayBy(int)
+nsVoidArray::ReplaceElementAt(void *, int)
+nsEventListenerManager::GetListenersByType(EventArrayType, nsHashKey *, int)
+
+<nsEventListenerManager>
+PR_Malloc
+nsVoidArray::SizeTo(int)
+nsAutoVoidArray::SizeTo(int)
+nsVoidArray::GrowArrayBy(int)
+nsVoidArray::ReplaceElementAt(void *, int)
+nsEventListenerManager::GetListenersByType(EventArrayType, nsHashKey *, int)
+
 <nsEventListenerManager>
 __builtin_new
 nsEventListenerManager::AddEventListener(nsIDOMEventListener *, nsID const &, int, int)
@@ -2762,6 +3032,18 @@ nsFixedSizeAllocator::AddBucket(unsigned int)
 nsFixedSizeAllocator::Init(char const *, unsigned int const *, int, int, int)
 CompositeDataSourceImpl::CompositeDataSourceImpl(void)
 
+<CompositeDataSourceImpl>
+PR_Malloc
+PL_ArenaAllocate
+nsFixedSizeAllocator::Alloc(unsigned int)
+CompositeDataSourceImpl::ArcLabelsIn(nsIRDFNode *, nsISimpleEnumerator **)
+
+<CompositeDataSourceImpl>
+PR_Malloc
+PL_ArenaAllocate
+nsFixedSizeAllocator::Alloc(unsigned int)
+CompositeDataSourceImpl::ArcLabelsOut(nsIRDFResource *, nsISimpleEnumerator **)
+
 <nsHTMLValue>
 PR_Malloc
 nsMemoryImpl::Alloc(unsigned int)
@@ -3204,6 +3486,11 @@ nsHashtable::nsHashtable(unsigned int, int)
 nsSupportsHashtable::nsSupportsHashtable(unsigned int, int)
 nsFormControlList::AddElementToTable(nsIFormControl *, basic_nsAReadableString<unsigned short> const &)
 
+<nsControllerCommandManager>
+__builtin_new
+__builtin_vec_new
+NS_NewControllerCommandManager(nsIControllerCommandManager **)
+
 <nsControllerCommandManager>
 PR_Malloc
 PL_HashTableFinalize(PLHashTable *)
@@ -3453,21 +3740,73 @@ __builtin_new
 __builtin_vec_new
 nsDiskCacheBlockFile::Open(nsILocalFile *, unsigned int)
 
-<nsConflictSet>
+<nsAssignmentSet>
+__builtin_new
+nsAssignmentSet::Add(nsAssignment const &)
+
+<nsConflictSet::mBindingDependencies>
 __builtin_new
 __builtin_vec_new
 nsConflictSet::AllocBindingTable(void *, unsigned int)
 
-<nsConflictSet>
+<nsConflictSet::mBindingDependencies>
+PR_Malloc
+PL_ArenaAllocate
+nsFixedSizeAllocator::Alloc(unsigned int)
+nsConflictSet::AllocBindingEntry(void *, void const *)
+
+<nsConflictSet::mClusters>
 __builtin_new
 __builtin_vec_new
 nsConflictSet::AllocClusterTable(void *, unsigned int)
 
-<nsConflictSet>
+<nsConflictSet::mClusters>
+PR_Malloc
+PL_ArenaAllocate
+nsFixedSizeAllocator::Alloc(unsigned int)
+nsConflictSet::AllocClusterEntry(void *, void const *)
+
+<nsConflictSet::mSupport>
 __builtin_new
 __builtin_vec_new
 nsConflictSet::AllocSupportTable(void *, unsigned int)
 
+<nsConflictSet::mSupport>
+PR_Malloc
+PL_ArenaAllocate
+nsFixedSizeAllocator::Alloc(unsigned int)
+nsConflictSet::AllocSupportEntry(void *, void const *)
+
+<nsConflictSet::mSupport>
+PR_Malloc
+PL_ArenaAllocate
+nsFixedSizeAllocator::Alloc(unsigned int)
+nsRDFConMemberTestNode::Element::Clone(void *) const
+
+<nsConflictSet::mSupport>
+PR_Malloc
+PL_ArenaAllocate
+nsFixedSizeAllocator::Alloc(unsigned int)
+nsRDFConInstanceTestNode::Element::Clone(void *) const
+
+<nsConflictSet::mSupport>
+PR_Malloc
+PL_ArenaAllocate
+nsFixedSizeAllocator::Alloc(unsigned int)
+nsRDFConInstanceTestNode::FilterInstantiations(InstantiationSet &, void *) const
+
+<nsConflictSet::mSupport>
+__builtin_new
+MemoryElementSet::Add(MemoryElement *)
+
+<nsConflictSet>
+PL_DHashAllocTable
+PL_DHashTableFinish
+PL_DHashTableOperate
+nsTemplateMatchRefSet::AddToTable(nsTemplateMatch *)
+nsTemplateMatchRefSet::Add(nsTemplateMatch const *)
+nsConflictSet::Add(nsTemplateMatch *)
+
 <nsConflictSet>
 PR_Malloc
 PL_ArenaAllocate
@@ -3475,6 +3814,53 @@ nsFixedSizeAllocator::AddBucket(unsigned int)
 nsFixedSizeAllocator::Init(char const *, unsigned int const *, int, int, int)
 nsConflictSet::Init(void)
 
+<nsXULTemplateBuilder>
+__builtin_new
+nsXULTemplateBuilder::CompileSimpleRule(nsIContent *, int, InnerNode *)
+
+<nsXULTemplateBuilder>
+PL_DHashAllocTable
+PL_DHashTableInit
+nsXULContentBuilder::nsXULContentBuilder(void)
+
+<nsXULTemplateBuilder>
+PL_DHashAllocTable
+PL_DHashTableInit
+nsContentSupportMap::Init(void)
+
+<nsXULTemplateBuilder>
+PL_DHashAllocTable
+PL_DHashTableFinish
+PL_DHashTableOperate
+nsXULContentBuilder::BuildContentFromTemplate(nsIContent *, nsIContent *, nsIContent *, int, nsIRDFResource *, int, nsTemplateMatch *, nsIContent **, int *)
+
+<nsRuleNetwork>
+PL_DHashAllocTable
+PL_DHashTableInit
+nsRuleNetwork::Init(void)
+
+<nsTemplateRule>
+__builtin_new
+nsTemplateRule::AddBinding(int, nsIRDFResource *, int)
+
+<nsTemplateMatch>
+__builtin_new
+nsAssignmentSet::Add(nsAssignment const &)
+nsTemplateRule::ComputeAssignmentFor(nsConflictSet &, nsTemplateMatch *, int, Value *) const
+nsTemplateMatch::GetAssignmentFor(nsConflictSet &, int, Value *)
+
+<nsTemplateMatch>
+PR_Malloc
+PL_ArenaAllocate
+nsFixedSizeAllocator::Alloc(unsigned int)
+nsInstantiationNode::Propogate(InstantiationSet const &, void *)
+
+<nsTemplateMatch>
+PR_Malloc
+PL_ArenaAllocate
+nsFixedSizeAllocator::Alloc(unsigned int)
+nsRDFConMemberTestNode::FilterInstantiations(InstantiationSet &, void *) const
+
 <nsXULPrototypeNode>
 __builtin_new
 __builtin_vec_new
@@ -3559,6 +3945,30 @@ nsCRT::strndup(unsigned short const *, unsigned int)
 nsCRT::strdup(unsigned short const *)
 nsCSSValue::operator=(nsCSSValue const &)
 
+<nsXULDocument>
+PR_Realloc
+nsVoidArray::SizeTo(int)
+nsAutoVoidArray::SizeTo(int)
+nsVoidArray::GrowArrayBy(int)
+nsVoidArray::InsertElementAt(void *, int)
+nsXULDocument::AddObserver(nsIDocumentObserver *)
+
+<nsXULDocument::mBoxObjectTable>
+PR_Malloc
+PL_HashTableFinalize(PLHashTable *)
+PL_HashTableRawAdd
+nsHashtable::Put(nsHashKey *, void *)
+nsSupportsHashtable::Put(nsHashKey *, nsISupports *, nsISupports **)
+nsXULDocument::SetBoxObjectFor(nsIDOMElement *, nsIBoxObject *)
+
+<nsXULDocument::mTemplateBuilderTable>
+PR_Malloc
+PL_HashTableFinalize(PLHashTable *)
+PL_HashTableRawAdd
+nsHashtable::Put(nsHashKey *, void *)
+nsSupportsHashtable::Put(nsHashKey *, nsISupports *, nsISupports **)
+nsXULDocument::SetTemplateBuilderFor(nsIContent *, nsIXULTemplateBuilder *)
+
 <nsXULDocument::mElementMap>
 PR_Malloc
 nsMemoryImpl::Alloc(unsigned int)
@@ -3593,6 +4003,27 @@ PL_HashTableRawAdd
 PL_HashTableAdd
 nsElementMap::Add(nsAString const &, nsIContent *)
 
+<nsXULDocument::mElementMap>
+PR_Malloc
+PL_ArenaAllocate
+nsFixedSizeAllocator::Alloc(unsigned int)
+nsElementMap::Add(nsAString const &, nsIContent *)
+
+<nsXULDocument::mElementMap>
+PR_Malloc
+PL_ArenaAllocate
+nsFixedSizeAllocator::AddBucket(unsigned int)
+nsFixedSizeAllocator::Init(char const *, unsigned int const *, int, int, int)
+nsElementMap::nsElementMap(void)
+
+<nsXULDocument::mContentWrapperHash>
+PR_Malloc
+PL_HashTableFinalize(PLHashTable *)
+PL_HashTableRawAdd
+nsHashtable::Put(nsHashKey *, void *)
+nsSupportsHashtable::Put(nsHashKey *, nsISupports *, nsISupports **)
+nsXULDocument::AddReference(void *, nsISupports *)
+
 <nsHTMLValue::mValue.mString>
 PR_Malloc
 nsMemoryImpl::Alloc(unsigned int)
@@ -3651,10 +4082,18 @@ nsClassList::ParseClasses(nsClassList **, nsAString const &)
 __builtin_new
 nsCheapVoidArray::SwitchToVector(void)
 
-<nsVoidArray/nsHashtable>
+<nsEventListenerManager>
 __builtin_new
 nsEventListenerManager::GetListenersByType(EventArrayType, nsHashKey *, int)
 
+<nsXBLBinding>
+PR_Malloc
+PL_HashTableFinalize(PLHashTable *)
+PL_HashTableRawAdd
+nsHashtable::Put(nsHashKey *, void *)
+nsSupportsHashtable::Put(nsHashKey *, nsISupports *, nsISupports **)
+nsXBLBinding::GetInsertionPointsFor(nsIContent *, nsISupportsArray **)
+
 <nsXBLBinding>
 PR_Malloc
 PL_HashTableFinalize(PLHashTable *)
@@ -3709,3 +4148,95 @@ PL_DHashTableOperate
 InMemoryDataSource::LockedAssert(nsIRDFResource *, nsIRDFResource *, nsIRDFNode *, int)
 InMemoryDataSource::Assert(nsIRDFResource *, nsIRDFResource *, nsIRDFNode *, int)
 BookmarkParser::updateAtom(nsIRDFDataSource *, nsIRDFResource *, nsIRDFResource *, nsIRDFNode *, int *)
+
+# ----------------------------------------------------------------------
+#
+# The following types will only be visible if nsPresShell.cpp is compiled
+# with the DEBUG_TRACEMALLOC_FRAMEARENA defined.
+#
+
+<nsStyleContext>
+PR_Malloc
+FrameArena::AllocateFrame(unsigned int, void **)
+PresShell::AllocateFrame(unsigned int, void **)
+nsPresContext::AllocateFromShell(unsigned int, void **)
+nsStyleContext::SetStyle(nsStyleStructID, nsStyleStruct const &)
+
+<nsStyleBorder>
+PR_Malloc
+FrameArena::AllocateFrame(unsigned int, void **)
+PresShell::AllocateFrame(unsigned int, void **)
+nsPresContext::AllocateFromShell(unsigned int, void **)
+nsStyleBorder::operator new(unsigned int, nsIPresContext *)
+
+# XXX This one is a bit sloppy, and may include some of the other
+# style data structs.
+<nsResetStyleData>
+PR_Malloc
+FrameArena::AllocateFrame(unsigned int, void **)
+PresShell::AllocateFrame(unsigned int, void **)
+nsPresContext::AllocateFromShell(unsigned int, void **)
+nsRuleNode::ComputeDisplayData(nsStyleStruct *, nsCSSStruct const &, nsIStyleContext *, nsRuleNode *, nsRuleNode::RuleDetail const &, int)
+
+<nsResetStyleData>
+PR_Malloc
+FrameArena::AllocateFrame(unsigned int, void **)
+PresShell::AllocateFrame(unsigned int, void **)
+nsPresContext::AllocateFromShell(unsigned int, void **)
+nsStyleContext::SetStyle(nsStyleStructID, nsStyleStruct const &)
+
+<nsResetStyleData>
+PR_Malloc
+FrameArena::AllocateFrame(unsigned int, void **)
+PresShell::AllocateFrame(unsigned int, void **)
+nsPresContext::AllocateFromShell(unsigned int, void **)
+nsRuleNode::ComputeBorderData(nsStyleStruct *, nsCSSStruct const &, nsIStyleContext *, nsRuleNode *, nsRuleNode::RuleDetail const &, int)
+
+<nsStyleUserInterface>
+PR_Malloc
+FrameArena::AllocateFrame(unsigned int, void **)
+PresShell::AllocateFrame(unsigned int, void **)
+nsPresContext::AllocateFromShell(unsigned int, void **)
+nsRuleNode::ComputeUIData(nsStyleStruct *, nsCSSStruct const &, nsIStyleContext *, nsRuleNode *, nsRuleNode::RuleDetail const &, int)
+
+<nsStylePosition>
+PR_Malloc
+FrameArena::AllocateFrame(unsigned int, void **)
+PresShell::AllocateFrame(unsigned int, void **)
+nsPresContext::AllocateFromShell(unsigned int, void **)
+nsRuleNode::ComputePositionData(nsStyleStruct *, nsCSSStruct const &, nsIStyleContext *, nsRuleNode *, nsRuleNode::RuleDetail const &, int)
+
+<nsStylePadding>
+PR_Malloc
+FrameArena::AllocateFrame(unsigned int, void **)
+PresShell::AllocateFrame(unsigned int, void **)
+nsPresContext::AllocateFromShell(unsigned int, void **)
+nsStylePadding::operator new(unsigned int, nsIPresContext *)
+
+<nsStyleMargin>
+PR_Malloc
+FrameArena::AllocateFrame(unsigned int, void **)
+PresShell::AllocateFrame(unsigned int, void **)
+nsPresContext::AllocateFromShell(unsigned int, void **)
+nsStyleMargin::operator new(unsigned int, nsIPresContext *)
+
+<nsStyleBackground>
+PR_Malloc
+FrameArena::AllocateFrame(unsigned int, void **)
+PresShell::AllocateFrame(unsigned int, void **)
+nsPresContext::AllocateFromShell(unsigned int, void **)
+nsRuleNode::ComputeBackgroundData(nsStyleStruct *, nsCSSStruct const &, nsIStyleContext *, nsRuleNode *, nsRuleNode::RuleDetail const &, int)
+
+# XXX this'll may be subsumed as nsResetStyleData
+<nsStyleDisplay>
+PR_Malloc
+FrameArena::AllocateFrame(unsigned int, void **)
+PresShell::AllocateFrame(unsigned int, void **)
+nsPresContext::AllocateFromShell(unsigned int, void **)
+nsRuleNode::ComputeDisplayData(nsStyleStruct *, nsCSSStruct const &, nsIStyleContext *, nsRuleNode *, nsRuleNode::RuleDetail const &, int)
+
+<FrameArena-unclassified>
+PR_Malloc
+FrameArena::AllocateFrame(unsigned int, void **)
+
+# ----------------------------------------------------------------------