Bug 397804. Use the short CC macro in nsParser. r/sr/a=sicking.
authorsayrer@gmail.com
Wed, 03 Oct 2007 19:11:57 -0700
changeset 6631 85c02151776c532a45982a0f039db6929636c329
parent 6630 e3296c87706bd843c4140836e71d076f0ca9d325
child 6632 1023ba567a58dd4d6464c1ce8910b49da0198935
push idunknown
push userunknown
push dateunknown
bugs397804
milestone1.9a9pre
Bug 397804. Use the short CC macro in nsParser. r/sr/a=sicking.
parser/htmlparser/src/nsParser.cpp
--- a/parser/htmlparser/src/nsParser.cpp
+++ b/parser/htmlparser/src/nsParser.cpp
@@ -284,28 +284,17 @@ nsParser::~nsParser()
   }
 
   // It should not be possible for this flag to be set when we are getting
   // destroyed since this flag implies a pending nsParserContinueEvent, which
   // has an owning reference to |this|.
   NS_ASSERTION(!(mFlags & NS_PARSER_FLAG_PENDING_CONTINUE_EVENT), "bad");
 }
 
-NS_IMPL_CYCLE_COLLECTION_CLASS(nsParser)
-
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsParser)
- NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mSink)
- NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mObserver)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
-
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsParser)
- NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mSink)
- NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mObserver)
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
+NS_IMPL_CYCLE_COLLECTION_2(nsParser, mSink, mObserver)
 NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsParser, nsIParser)
 NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsParser, nsIParser)
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsParser)
  NS_INTERFACE_MAP_ENTRY(nsIStreamListener)
  NS_INTERFACE_MAP_ENTRY(nsIParser)
  NS_INTERFACE_MAP_ENTRY(nsIRequestObserver)
  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIParser)
 NS_INTERFACE_MAP_END