Bug 807437 - Eliminate redundant Traverse/Unlink CC macros - part 2: handmade fixups - r=mccr8

This commit is contained in:
Benoit Jacob 2012-11-15 02:32:40 -05:00
parent a1d7e0f511
commit bc758b2b7a
3 changed files with 3 additions and 37 deletions

View File

@ -138,8 +138,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsAnonymousContentList)
{
int32_t i, count = tmp->mElements->Length();
for (i = 0; i < count; ++i) {
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mElements->ElementAt(i),
nsXBLInsertionPoint);
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mElements->ElementAt(i));
}
}
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS

View File

@ -291,11 +291,11 @@ def write_cpp(eventname, iface, fd):
fd.write("NS_IMPL_CYCLE_COLLECTION_CLASS(%s)\n\n" % classname)
fd.write("NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(%s, %s)\n" % (classname, basename))
for c in ccattributes:
fd.write(" NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(m%s)\n" % firstCap(c.name))
fd.write(" NS_IMPL_CYCLE_COLLECTION_UNLINK(m%s)\n" % firstCap(c.name))
fd.write("NS_IMPL_CYCLE_COLLECTION_UNLINK_END\n\n");
fd.write("NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(%s, %s)\n" % (classname, basename))
for c in ccattributes:
fd.write(" NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(m%s)\n" % firstCap(c.name))
fd.write(" NS_IMPL_CYCLE_COLLECTION_TRAVERSE(m%s)\n" % firstCap(c.name))
fd.write("NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END\n\n");
fd.write("NS_IMPL_ADDREF_INHERITED(%s, %s)\n" % (classname, basename))

View File

@ -400,15 +400,6 @@ T* DowncastCCParticipant(void *p)
#define NS_IMPL_CYCLE_COLLECTION_UNLINK(_field) \
ImplCycleCollectionUnlink(tmp->_field);
#define NS_IMPL_CYCLE_COLLECTION_UNLINK(_field) \
NS_IMPL_CYCLE_COLLECTION_UNLINK(_field)
#define NS_IMPL_CYCLE_COLLECTION_UNLINK(_field) \
NS_IMPL_CYCLE_COLLECTION_UNLINK(_field)
#define NS_IMPL_CYCLE_COLLECTION_UNLINK(_field) \
NS_IMPL_CYCLE_COLLECTION_UNLINK(_field)
#define NS_IMPL_CYCLE_COLLECTION_UNLINK_END \
(void)tmp; \
return NS_OK; \
@ -471,30 +462,6 @@ T* DowncastCCParticipant(void *p)
#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(_field) \
CycleCollectionNoteChild(cb, tmp->_field, #_field);
#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field) \
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field)
#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field) \
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field)
#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field) \
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field)
#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_ptr) \
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_ptr)
#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field) \
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field)
#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_array) \
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_array)
#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field) \
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field)
#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field) \
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field)
#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS \
that->Trace(p, &nsScriptObjectTracer::NoteJSChild, &cb);