166917. Clean up xpcom SDK includes. r=rpotts@netscape.com, sr=alecf@netscape.com, a=rjesup@wgate.com

accessible/src/base/nsAccessibilityService.cpp

@@ -104,7 +104,7 @@
 
 nsAccessibilityService::nsAccessibilityService()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   nsLayoutAtoms::AddRefAtoms();
 }
 

accessible/src/base/nsAccessible.cpp

@@ -437,7 +437,7 @@ PRBool nsAccessibleTreeWalker::GetAccessible()
 //-----------------------------------------------------
 nsAccessible::nsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell): mDOMNode(aNode), mPresShell(aShell), mSiblingIndex(eSiblingsUninitialized)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
 #ifdef NS_DEBUG_X
    {

caps/src/nsScriptSecurityManager.cpp

@@ -2502,7 +2502,7 @@ nsScriptSecurityManager::nsScriptSecurityManager(void)
 
 {
     NS_ASSERTION(sizeof(long) == sizeof(void*), "long and void* have different lengths on this platform. This may cause a security failure.");
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 
     JSContext* cx = GetSafeJSContext();
     if (sCallerID == JSVAL_VOID)

caps/src/nsSecurityManagerFactory.cpp

@@ -77,7 +77,7 @@ public:
 
 nsSecurityNameSet::nsSecurityNameSet()
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 }
 
 nsSecurityNameSet::~nsSecurityNameSet()

chrome/src/nsChromeProtocolHandler.cpp

@@ -180,7 +180,7 @@ nsCachedChromeChannel::Create(nsIURI* aURI, nsIChannel** aResult)
 nsCachedChromeChannel::nsCachedChromeChannel(nsIURI* aURI)
     : mURI(aURI), mLoadGroup(nsnull), mLoadFlags (nsIRequest::LOAD_NORMAL), mStatus(NS_OK)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 
 #ifdef PR_LOGGING
     if (! gLog)
@@ -495,7 +495,7 @@ nsCachedChromeChannel::DestroyLoadEvent(PLEvent* aEvent)
 
 nsChromeProtocolHandler::nsChromeProtocolHandler()
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 }
 
 nsresult

chrome/src/nsChromeRegistry.cpp

@@ -166,7 +166,7 @@ NS_IMPL_ISUPPORTS1(nsOverlayEnumerator, nsISimpleEnumerator)
 nsOverlayEnumerator::nsOverlayEnumerator(nsISimpleEnumerator *aInstallArcs,
                                          nsISimpleEnumerator *aProfileArcs)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mInstallArcs = aInstallArcs;
   mProfileArcs = aProfileArcs;
   mCurrentArcs = mInstallArcs;
@@ -254,7 +254,7 @@ nsChromeRegistry::nsChromeRegistry() : mRDFService(nsnull),
                                        mBatchInstallFlushes(PR_FALSE),
                                        mSearchedForOverride(PR_FALSE)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   nsCOMPtr<nsIPref> prefService(do_GetService(kPrefServiceCID));
   if (prefService)

chrome/src/nsChromeUIDataSource.cpp

@@ -64,7 +64,7 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
 
 nsChromeUIDataSource::nsChromeUIDataSource(nsIRDFDataSource* aComposite)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mComposite = aComposite;
   mComposite->AddObserver(this);
 

content/base/src/nsContentAreaDragDrop.cpp

@@ -115,7 +115,7 @@ NS_INTERFACE_MAP_END
 nsContentAreaDragDrop::nsContentAreaDragDrop ( ) 
   : mListenerInstalled(PR_FALSE), mNavigator(nsnull), mOverrideDrag(nsnull), mOverrideDrop(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 } // ctor
 
 

content/base/src/nsContentIterator.cpp

@@ -263,7 +263,7 @@ nsContentIterator::nsContentIterator() :
   // don't need to explicitly initialize |nsCOMPtr|s, they will automatically be NULL
   mCachedIndex(0), mIsDone(PR_FALSE), mPre(PR_FALSE)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 

content/base/src/nsContentList.cpp

@@ -60,7 +60,7 @@ static nsIContentList *gCachedContentList;
 
 nsBaseContentList::nsBaseContentList()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsBaseContentList::~nsBaseContentList()
@@ -223,7 +223,7 @@ nsFormContentList::nsFormContentList(nsIDOMHTMLFormElement *aForm,
                                      nsBaseContentList& aContentList)
   : nsBaseContentList()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   // move elements that belong to mForm into this content list
 

content/base/src/nsContentPolicy.cpp

@@ -47,7 +47,7 @@ NS_NewContentPolicy(nsIContentPolicy **aResult)
  */
 nsContentPolicy::nsContentPolicy()
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
     nsresult rv;
     nsCOMPtr<nsICategoryManager> catman = 
              do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);

content/base/src/nsDOMAttribute.cpp

@@ -55,7 +55,7 @@ nsDOMAttribute::nsDOMAttribute(nsIContent* aContent, nsINodeInfo *aNodeInfo,
 {
   NS_ABORT_IF_FALSE(mNodeInfo, "We must get a nodeinfo here!");
 
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   // We don't add a reference to our content. It will tell us
   // to drop our reference when it goes away.

content/base/src/nsDOMAttributeMap.cpp

@@ -49,7 +49,7 @@
 nsDOMAttributeMap::nsDOMAttributeMap(nsIContent* aContent)
   : mContent(aContent)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   // We don't add a reference to our content. If it goes away,
   // we'll be told to drop our reference
 }

content/base/src/nsDOMBuilder.cpp

@@ -63,7 +63,7 @@ nsDOMBuilder::nsDOMBuilder(PRUint16 aMode,
 			   const nsAString& aSchemaType,
 			   nsIDOMDOMImplementation* aDOMImplementation)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mDOMImplementation = aDOMImplementation;
 }
 

content/base/src/nsDOMDocumentType.cpp

@@ -77,7 +77,7 @@ nsDOMDocumentType::nsDOMDocumentType(const nsAString& aName,
   mSystemId(aSystemId),
   mInternalSubset(aInternalSubset)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   mEntities = aEntities;
   mNotations = aNotations;

content/base/src/nsDocument.cpp

@@ -159,7 +159,7 @@ struct nsRadioGroupStruct
 
 nsDOMStyleSheetList::nsDOMStyleSheetList(nsIDocument *aDocument)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mLength = -1;
   // Not reference counted to avoid circular references.
   // The document will tell us when its going away.
@@ -337,7 +337,7 @@ NS_NewDOMImplementation(nsIDOMDOMImplementation** aInstancePtrResult)
 
 nsDOMImplementation::nsDOMImplementation(nsIURI* aBaseURI)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mBaseURI = aBaseURI;
 }
 
@@ -516,7 +516,7 @@ nsDocument::nsDocument() : mSubDocuments(nsnull),
                            mCSSLoader(nsnull),
                            mXPathDocument(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   mArena = nsnull;
   mDocumentURL = nsnull;

content/base/src/nsDocumentEncoder.cpp

@@ -184,7 +184,7 @@ NS_INTERFACE_MAP_END
 
 nsDocumentEncoder::nsDocumentEncoder()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   mMimeType.Assign(NS_LITERAL_STRING("text/plain"));
 

content/base/src/nsDocumentViewer.cpp

@@ -269,7 +269,7 @@ public:
                        , mGotSelectionState(PR_FALSE)
                        , mSelectionWasCollapsed(PR_FALSE)
                        {
-                         NS_INIT_REFCNT();
+                         NS_INIT_ISUPPORTS();
                        }
 
   virtual              ~nsDocViewerSelectionListener() {}
@@ -2979,7 +2979,7 @@ NS_IMPL_ISUPPORTS1(nsDocViewerFocusListener, nsIDOMFocusListener);
 nsDocViewerFocusListener::nsDocViewerFocusListener()
 :mDocViewer(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsDocViewerFocusListener::~nsDocViewerFocusListener(){}

content/base/src/nsGeneratedIterator.cpp

@@ -251,7 +251,7 @@ nsGeneratedContentIterator::nsGeneratedContentIterator() :
   // don't need to explicitly initialize |nsCOMPtr|s, they will automatically be NULL
   mIsDone(PR_FALSE), mPre(PR_FALSE)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 

content/base/src/nsGenericDOMNodeList.cpp

@@ -41,7 +41,7 @@
 
 nsGenericDOMNodeList::nsGenericDOMNodeList() 
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsGenericDOMNodeList::~nsGenericDOMNodeList()

content/base/src/nsGenericElement.cpp

@@ -797,7 +797,7 @@ nsGenericElement::nsGenericElement()
   : mDocument(nsnull), mParent(nsnull), mNodeInfo(nsnull),
     mFlagsOrSlots(GENERIC_ELEMENT_DOESNT_HAVE_DOMSLOTS)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsGenericElement::~nsGenericElement()

content/base/src/nsNameSpaceManager.cpp

@@ -219,7 +219,7 @@ NameSpaceImpl::NameSpaceImpl(nsINameSpaceManager* aManager,
     mPrefix(aPrefix)
 {
   NS_ASSERTION(aManager, "null namespace manager");
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   NS_ADDREF(mManager);
   NS_IF_ADDREF(mParent);
   NS_IF_ADDREF(mPrefix);
@@ -236,7 +236,7 @@ NameSpaceImpl::NameSpaceImpl(nsINameSpaceManager* aManager,
     mID(aNameSpaceID)
 {
   NS_ASSERTION(aManager, "null namespace manager");
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   NS_ADDREF(mManager);
   NS_IF_ADDREF(mParent);
   NS_IF_ADDREF(mPrefix);
@@ -413,7 +413,7 @@ NameSpaceManagerImpl::NameSpaceManagerImpl()
   NS_ASSERTION(!gNameSpaceManagerWasShutDown,
                "Namespace manager used past content module shutdown!!!");
 
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   InitializeNameSpaceManager();
 }

content/base/src/nsNodeInfo.cpp

@@ -50,7 +50,7 @@
 nsNodeInfo::nsNodeInfo()
   : nsINodeInfo(), mOwnerManager(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 

content/base/src/nsNodeInfoManager.cpp

@@ -94,7 +94,7 @@ nsNodeInfoManager::NodeInfoInnerKeyCompare(const void *key1, const void *key2)
 nsNodeInfoManager::nsNodeInfoManager()
   : mDocument(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   if (gNodeManagerCount == 1 && gAnonymousNodeInfoManager) {
     /*

content/base/src/nsPrintPreviewListener.cpp

@@ -43,7 +43,7 @@ nsPrintPreviewListener::nsPrintPreviewListener (nsIDOMEventReceiver* aEVRec)
   : mEventReceiver(aEVRec),
     mRegFlags(REG_NONE_LISTENER)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   NS_ADDREF_THIS();
 } // ctor
 

content/base/src/nsRange.cpp

@@ -322,7 +322,7 @@ NS_NewRangeUtils(nsIRangeUtils** aResult)
 
 nsRangeUtils::nsRangeUtils()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 } 
 
 nsRangeUtils::~nsRangeUtils() 
@@ -421,7 +421,7 @@ nsRange::nsRange() :
   mStartParent(),
   mEndParent()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 } 
 
 nsRange::~nsRange() 

content/base/src/nsSelection.cpp

@@ -810,7 +810,7 @@ IsValidSelectionPoint(nsSelection *aFrameSel, nsIContent *aContent)
 nsSelectionIterator::nsSelectionIterator(nsTypedSelection *aList)
 :mIndex(0)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   if (!aList)
   {
     NS_NOTREACHED("nsSelection");
@@ -967,7 +967,7 @@ nsSelectionIterator::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 
 nsSelection::nsSelection()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   PRInt32 i;
   for (i = 0;i<nsISelectionController::NUM_SELECTIONTYPES;i++){
     mDomSelections[i] = nsnull;
@@ -4710,7 +4710,7 @@ nsTypedSelection::nsTypedSelection(nsSelection *aList)
   NS_NewISupportsArray(getter_AddRefs(mRangeArray));
   mAutoScrollTimer = nsnull;
   NS_NewISupportsArray(getter_AddRefs(mSelectionListeners));
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mScrollEventPosted = PR_FALSE;
 }
 
@@ -4723,7 +4723,7 @@ nsTypedSelection::nsTypedSelection()
   NS_NewISupportsArray(getter_AddRefs(mRangeArray));
   mAutoScrollTimer = nsnull;
   NS_NewISupportsArray(getter_AddRefs(mSelectionListeners));
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mScrollEventPosted = PR_FALSE;
 }
 

content/base/src/nsStyleSet.cpp

@@ -393,7 +393,7 @@ StyleSetImpl::StyleSetImpl()
     ,mTimerEnabled(PR_FALSE)
 #endif
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   if (gInstances++ == 0)
   {
     static const char kQuirk_href[] = "resource:/res/quirk.css";

content/base/src/nsTextContentChangeData.cpp

@@ -57,7 +57,7 @@ nsTextContentChangeData::nsTextContentChangeData()
     mLength(0),
     mReplaceLength(0)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsTextContentChangeData::~nsTextContentChangeData()

content/build/nsContentDLF.cpp

@@ -151,7 +151,7 @@ NS_NewContentDocumentLoaderFactory(nsIDocumentLoaderFactory** aResult)
 
 nsContentDLF::nsContentDLF()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsContentDLF::~nsContentDLF()

content/events/src/nsDOMEvent.cpp

@@ -149,7 +149,7 @@ nsDOMEvent::operator delete(void* aPtr)
 nsDOMEvent::nsDOMEvent(nsIPresContext* aPresContext, nsEvent* aEvent,
                        const nsAString& aEventType) 
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   mPresContext = aPresContext;
   mEventIsTrusted = PR_FALSE;

content/events/src/nsEventListenerManager.cpp

@@ -101,7 +101,7 @@ nsEventListenerManager::nsEventListenerManager()
   mListenersRemoved = PR_FALSE;
 
   mTarget = nsnull;
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 static PRBool PR_CALLBACK

content/events/src/nsPrivateTextRange.cpp

@@ -44,7 +44,7 @@ nsPrivateTextRange::nsPrivateTextRange(PRUint16 aRangeStart, PRUint16 aRangeEnd,
 	mRangeEnd(aRangeEnd),
 	mRangeType(aRangeType)
 {
-	NS_INIT_REFCNT();
+	NS_INIT_ISUPPORTS();
 }
 
 nsPrivateTextRange::~nsPrivateTextRange(void)
@@ -99,7 +99,7 @@ nsPrivateTextRangeList::nsPrivateTextRangeList(PRUint16 aLength,
            mLength = 0;
         }
 
-	NS_INIT_REFCNT();
+	NS_INIT_ISUPPORTS();
 }
 
 nsPrivateTextRangeList::~nsPrivateTextRangeList(void)

content/html/content/src/nsAttributeContent.cpp

@@ -259,7 +259,7 @@ NS_NewAttributeContent(nsIContent** aContent)
 nsAttributeContent::nsAttributeContent()
   : mText()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mDocument = nsnull;
   mParent   = nsnull;
   mContent  = nsnull;

content/html/content/src/nsGenericDOMHTMLCollection.cpp

@@ -42,7 +42,7 @@
 
 nsGenericDOMHTMLCollection::nsGenericDOMHTMLCollection() 
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsGenericDOMHTMLCollection::~nsGenericDOMHTMLCollection()

content/html/content/src/nsGenericHTMLElement.cpp

@@ -201,7 +201,7 @@ class nsGenericHTMLElementTearoff : public nsIDOMNSHTMLElement,
   nsGenericHTMLElementTearoff(nsGenericHTMLElement *aElement)
     : mElement(aElement)
   {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
     NS_ADDREF(mElement);
   }
 

content/html/content/src/nsHTMLBodyElement.cpp

@@ -140,7 +140,7 @@ protected:
 
 BodyRule::BodyRule(nsHTMLBodyElement* aPart, nsIHTMLStyleSheet* aSheet)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mPart = aPart;
   mSheet = aSheet;
 }

content/html/content/src/nsHTMLFormElement.cpp

@@ -1457,7 +1457,7 @@ nsFormControlList::nsFormControlList(nsIDOMHTMLFormElement* aForm)
   : mForm(aForm),
     mNameLookupTable(NS_FORM_CONTROL_LIST_HASHTABLE_SIZE)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsFormControlList::~nsFormControlList()

content/html/document/src/nsHTMLContentSink.cpp

@@ -580,7 +580,7 @@ DummyParserRequest::Create(nsIRequest** aResult, nsIHTMLContentSink* aSink)
 
 DummyParserRequest::DummyParserRequest(nsIHTMLContentSink* aSink)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   if (gRefCnt++ == 0) {
       nsresult rv;
@@ -928,7 +928,7 @@ NS_NewHTMLElementFactory(nsIElementFactory** aInstancePtrResult)
 
 nsHTMLElementFactory::nsHTMLElementFactory()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsHTMLElementFactory::~nsHTMLElementFactory()
@@ -2092,7 +2092,7 @@ NS_NewHTMLContentSink(nsIHTMLContentSink** aResult,
 
 // Note: operator new zeros our memory
 HTMLContentSink::HTMLContentSink() {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 #ifdef NS_DEBUG
   if (nsnull == gSinkLogModuleInfo) {
     gSinkLogModuleInfo = PR_NewLogModule("htmlcontentsink");

content/html/document/src/nsHTMLFragmentContentSink.cpp

@@ -188,7 +188,7 @@ NS_NewHTMLFragmentContentSink(nsIHTMLFragmentContentSink** aResult)
 
 nsHTMLFragmentContentSink::nsHTMLFragmentContentSink()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mHitSentinel = PR_FALSE;
   mSeenBody = PR_TRUE;
   mRoot = nsnull;

content/html/style/src/nsCSSLoader.cpp

@@ -346,7 +346,7 @@ SheetLoadData::SheetLoadData(CSSLoaderImpl* aLoader, nsIURI* aURL,
     mSyncLoad(PR_FALSE),
     mObserver(aObserver)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   NS_ADDREF(mLoader);
   NS_ADDREF(mURL);
   NS_IF_ADDREF(mOwningElement);
@@ -379,7 +379,7 @@ SheetLoadData::SheetLoadData(CSSLoaderImpl* aLoader, nsIURI* aURL,
     mSyncLoad(PR_FALSE),
     mObserver(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   NS_ADDREF(mLoader);
   NS_ADDREF(mURL);
   NS_ADDREF(mParentSheet);
@@ -407,7 +407,7 @@ SheetLoadData::SheetLoadData(CSSLoaderImpl* aLoader, nsIURI* aURL,
     mSyncLoad(PRBool(nsnull == aObserver)),
     mObserver(aObserver)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   NS_ADDREF(mLoader);
   NS_ADDREF(mURL);
   NS_IF_ADDREF(mObserver);
@@ -428,7 +428,7 @@ SheetLoadData::~SheetLoadData(void)
 
 CSSLoaderImpl::CSSLoaderImpl(void)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mDocument = nsnull;
   mCaseSensitive = PR_FALSE;
   mCompatMode = eCompatibility_FullStandards;

content/html/style/src/nsCSSParser.cpp

@@ -430,7 +430,7 @@ CSSParserImpl::CSSParserImpl()
     mGroupStack(nsnull),
     mParsingCompoundProperty(PR_FALSE)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 NS_IMETHODIMP

content/html/style/src/nsCSSRule.cpp

@@ -78,14 +78,14 @@ nsCSSRule::nsCSSRule(void)
   : mSheet(nsnull),
     mParentRule(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsCSSRule::nsCSSRule(const nsCSSRule& aCopy)
   : mSheet(aCopy.mSheet),
     mParentRule(aCopy.mParentRule)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 

content/html/style/src/nsCSSRules.cpp

@@ -107,7 +107,7 @@ private:
 
 CSSGroupRuleRuleListImpl::CSSGroupRuleRuleListImpl(nsICSSGroupRule *aGroupRule)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   // Not reference counted to avoid circular references.
   // The rule will tell us when its going away.
   mGroupRule = aGroupRule;

content/html/style/src/nsCSSStyleRule.cpp

@@ -969,7 +969,7 @@ CSSImportantRule::CSSImportantRule(nsICSSStyleSheet* aSheet, nsCSSDeclaration* a
   : mDeclaration(aDeclaration),
     mSheet(aSheet)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 CSSImportantRule::~CSSImportantRule(void)

content/html/style/src/nsCSSStyleSheet.cpp

@@ -975,7 +975,7 @@ public:
 
 CSSRuleListImpl::CSSRuleListImpl(CSSStyleSheetImpl *aStyleSheet)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   // Not reference counted to avoid circular references.
   // The style sheet will tell us when its going away.
   mStyleSheet = aStyleSheet;
@@ -1094,7 +1094,7 @@ DOMMediaListImpl::DOMMediaListImpl(nsISupportsArray *aArray,
                                    CSSStyleSheetImpl *aStyleSheet)
   : mArray(aArray), mStyleSheet(aStyleSheet)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   NS_ABORT_IF_FALSE(mArray, "This can't be used without an array!!");
 }
@@ -1414,7 +1414,7 @@ protected:
 
 CSSImportsCollectionImpl::CSSImportsCollectionImpl(nsICSSStyleSheet *aStyleSheet)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   // Not reference counted to avoid circular references.
   // The style sheet will tell us when its going away.
   mStyleSheet = aStyleSheet;
@@ -1781,7 +1781,7 @@ CSSStyleSheetImpl::CSSStyleSheetImpl()
     mDirty(PR_FALSE),
     mRuleProcessors(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   mInner = new CSSStyleSheetInner(this);
 }
@@ -1803,7 +1803,7 @@ CSSStyleSheetImpl::CSSStyleSheetImpl(const CSSStyleSheetImpl& aCopy)
     mInner(aCopy.mInner),
     mRuleProcessors(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   mInner->AddSheet(this);
 
@@ -3288,7 +3288,7 @@ CSSRuleProcessor::CSSRuleProcessor(void)
   : mSheets(nsnull),
     mRuleCascades(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 static PRBool

content/html/style/src/nsComputedDOMStyle.cpp

@@ -295,7 +295,7 @@ NS_NewComputedDOMStyle(nsIComputedDOMStyle** aComputedStyle)
 nsComputedDOMStyle::nsComputedDOMStyle()
   : mPresShellWeak(nsnull), mT2P(0.0f)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 

content/html/style/src/nsDOMCSSDeclaration.cpp

@@ -50,7 +50,7 @@
 
 nsDOMCSSDeclaration::nsDOMCSSDeclaration()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsDOMCSSDeclaration::~nsDOMCSSDeclaration()

content/html/style/src/nsDOMCSSRGBColor.cpp

@@ -48,7 +48,7 @@ nsDOMCSSRGBColor::nsDOMCSSRGBColor(nsIDOMCSSPrimitiveValue* aRed,
                                    nsIDOMCSSPrimitiveValue* aBlue)
   : mRed(aRed), mGreen(aGreen), mBlue(aBlue)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsDOMCSSRGBColor::~nsDOMCSSRGBColor(void)

content/html/style/src/nsDOMCSSRect.cpp

@@ -48,7 +48,7 @@ nsDOMCSSRect::nsDOMCSSRect(nsIDOMCSSPrimitiveValue* aTop,
                            nsIDOMCSSPrimitiveValue* aLeft)
   : mTop(aTop), mRight(aRight), mBottom(aBottom), mLeft(aLeft)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsDOMCSSRect::~nsDOMCSSRect(void)

content/html/style/src/nsDOMCSSValueList.cpp

@@ -44,7 +44,7 @@
 nsDOMCSSValueList::nsDOMCSSValueList(PRBool aCommaDelimited, PRBool aReadonly)
   : mCommaDelimited(aCommaDelimited), mReadonly(aReadonly)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsDOMCSSValueList::~nsDOMCSSValueList()

content/html/style/src/nsHTMLCSSStyleSheet.cpp

@@ -84,7 +84,7 @@ public:
 CSSFirstLineRule::CSSFirstLineRule(nsIHTMLCSSStyleSheet* aSheet)
   : mSheet(aSheet)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 CSSFirstLineRule::~CSSFirstLineRule()

content/html/style/src/nsHTMLStyleSheet.cpp

@@ -110,7 +110,7 @@ protected:
 HTMLColorRule::HTMLColorRule(nsIHTMLStyleSheet* aSheet)
   : mSheet(aSheet)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 HTMLColorRule::~HTMLColorRule()
@@ -298,7 +298,7 @@ public:
 
 GenericTableRule::GenericTableRule(nsIHTMLStyleSheet* aSheet)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mSheet = aSheet;
 }
 
@@ -865,7 +865,7 @@ HTMLStyleSheetImpl::HTMLStyleSheetImpl(void)
     mActiveRule(nsnull),
     mDocumentColorRule(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mMappedAttrTable.ops = nsnull;
 }
 

content/html/style/src/nsROCSSPrimitiveValue.cpp

@@ -49,7 +49,7 @@ nsROCSSPrimitiveValue::nsROCSSPrimitiveValue(float aT2P)
   : mType(CSS_PX), mT2P(aT2P)
 {
   mValue.mTwips = 0;
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 

content/xbl/src/nsBindingManager.cpp

@@ -411,7 +411,7 @@ NS_IMPL_ISUPPORTS3(nsBindingManager, nsIBindingManager, nsIStyleRuleSupplier, ns
 // Constructors/Destructors
 nsBindingManager::nsBindingManager(void)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   mBindingTable = nsnull;
   mContentListTable = nsnull;

content/xbl/src/nsXBLBinding.cpp

@@ -243,7 +243,7 @@ nsXBLBinding::nsXBLBinding(nsIXBLPrototypeBinding* aBinding)
   mIsStyleBinding(PR_TRUE),
   mMarkedForDeath(PR_FALSE)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mPrototypeBinding = aBinding;
   gRefCnt++;
   //  printf("REF COUNT UP: %d %s\n", gRefCnt, (const char*)mID);

content/xbl/src/nsXBLDocumentInfo.cpp

@@ -133,7 +133,7 @@ nsXBLDocGlobalObject::nsXBLDocGlobalObject()
     : mJSObject(nsnull),
       mGlobalObjectOwner(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 

content/xbl/src/nsXBLEventHandler.cpp

@@ -80,7 +80,7 @@
 
 nsXBLEventHandler::nsXBLEventHandler(nsIDOMEventReceiver* aEventReceiver, nsIXBLPrototypeHandler* aHandler)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mEventReceiver = aEventReceiver;
   mProtoHandler = aHandler;
   mNextHandler = nsnull;

content/xbl/src/nsXBLInsertionPoint.cpp

@@ -45,7 +45,7 @@
 nsXBLInsertionPoint::nsXBLInsertionPoint(nsIContent* aParentElement, PRUint32 aIndex, nsIContent* aDefaultContent)
 :mElements(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mParentElement = aParentElement;
   mIndex = aIndex;
   mDefaultContentTemplate = aDefaultContent;

content/xbl/src/nsXBLPrototypeBinding.cpp

@@ -137,7 +137,7 @@ public:
 
 protected:
   nsXBLAttributeEntry(nsIAtom* aSrcAtom, nsIAtom* aDstAtom, nsIContent* aContent) {
-    NS_INIT_REFCNT(); mSrcAttribute = aSrcAtom; mDstAttribute = aDstAtom; mElement = aContent;
+    NS_INIT_ISUPPORTS(); mSrcAttribute = aSrcAtom; mDstAttribute = aDstAtom; mElement = aContent;
   }
 
   virtual ~nsXBLAttributeEntry() {}
@@ -208,7 +208,7 @@ public:
 
 protected:
   nsXBLInsertionPointEntry(nsIContent* aParent) {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
     mInsertionIndex = 0;
     mInsertionParent = aParent;
   };
@@ -266,7 +266,7 @@ nsXBLPrototypeBinding::nsXBLPrototypeBinding(const nsACString& aID, nsIXBLDocume
   mInsertionPointTable(nsnull),
   mInterfaceTable(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   
   mID = ToNewCString(aID);
 

content/xbl/src/nsXBLPrototypeHandler.cpp

@@ -99,7 +99,7 @@ nsXBLPrototypeHandler::nsXBLPrototypeHandler(const PRUnichar* aEvent, const PRUn
                                              const PRUnichar* aModifiers, const PRUnichar* aButton,
                                              const PRUnichar* aClickCount, const PRUnichar* aPreventDefault)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   ++gRefCnt;
   if (gRefCnt == 1)
     // Get the primary accelerator key.
@@ -113,7 +113,7 @@ nsXBLPrototypeHandler::nsXBLPrototypeHandler(const PRUnichar* aEvent, const PRUn
 
 nsXBLPrototypeHandler::nsXBLPrototypeHandler(nsIContent* aHandlerElement)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   
   ++gRefCnt;
   if (gRefCnt == 1)

content/xbl/src/nsXBLResourceLoader.cpp

@@ -70,7 +70,7 @@ nsXBLResourceLoader::nsXBLResourceLoader(nsIXBLPrototypeBinding* aBinding, nsXBL
  mInLoadResourcesFunc(PR_FALSE),
  mPendingSheets(0)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsXBLResourceLoader::~nsXBLResourceLoader()

content/xbl/src/nsXBLService.cpp

@@ -478,7 +478,7 @@ private:
 public:
   nsProxyStream(void) : mBuffer(nsnull)
   {
-      NS_INIT_REFCNT();
+      NS_INIT_ISUPPORTS();
   }
 
   virtual ~nsProxyStream(void) {
@@ -562,7 +562,7 @@ NS_IMPL_ISUPPORTS3(nsXBLService, nsIXBLService, nsIObserver, nsISupportsWeakRefe
 // Constructors/Destructors
 nsXBLService::nsXBLService(void)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mPool.Init("XBL Binding Requests", kBucketSizes, kNumBuckets, kInitialSize);
 
   gRefCnt++;

content/xml/content/src/nsXMLNamedNodeMap.cpp

@@ -93,7 +93,7 @@ NS_NewXMLNamedNodeMap(nsIDOMNamedNodeMap** aInstancePtrResult,
 
 nsXMLNamedNodeMap::nsXMLNamedNodeMap(nsISupportsArray *aArray)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   mArray = aArray;
 

content/xml/document/src/nsLoadSaveContentSink.cpp

@@ -62,7 +62,7 @@ NS_NewLoadSaveContentSink(nsILoadSaveContentSink** aResult,
 
 nsLoadSaveContentSink::nsLoadSaveContentSink()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsLoadSaveContentSink::~nsLoadSaveContentSink()

content/xml/document/src/nsXMLContentSink.cpp

@@ -161,7 +161,7 @@ NS_NewXMLContentSink(nsIXMLContentSink** aResult,
 
 nsXMLContentSink::nsXMLContentSink()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   gRefCnt++;
   if (gRefCnt == 1) {
 #ifdef DEBUG
@@ -1514,7 +1514,7 @@ public:
 
 XMLElementFactoryImpl::XMLElementFactoryImpl()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 XMLElementFactoryImpl::~XMLElementFactoryImpl()
@@ -1575,7 +1575,7 @@ public:
 
 MathMLElementFactoryImpl::MathMLElementFactoryImpl()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 MathMLElementFactoryImpl::~MathMLElementFactoryImpl()

content/xsl/document/src/nsTransformMediator.cpp

@@ -62,7 +62,7 @@ NS_NewTransformMediator(nsITransformMediator** aInstancePtrResult,
 nsTransformMediator::nsTransformMediator() : mEnabled(PR_FALSE),
                                              mStyleInvalid(PR_FALSE)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsTransformMediator::~nsTransformMediator()

content/xul/content/src/nsRDFDOMNodeList.cpp

@@ -63,7 +63,7 @@ nsRDFDOMNodeList::nsRDFDOMNodeList(void)
     : //mInner(nsnull), Not being used?
       mElements(nsnull)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 }
 
 nsRDFDOMNodeList::~nsRDFDOMNodeList(void)

content/xul/content/src/nsXULAttributes.cpp

@@ -159,7 +159,7 @@ nsXULAttribute::nsXULAttribute(nsIContent* aContent,
     : mContent(aContent),
       mNodeInfo(aNodeInfo)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
     NS_IF_ADDREF(aNodeInfo);
     SetValueInternal(aValue);
 }
@@ -507,7 +507,7 @@ nsXULAttributes::nsXULAttributes(nsIContent* aContent)
       mClassList(nsnull),
       mStyleRule(nsnull)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 }
 
 

content/xul/content/src/nsXULElement.cpp

@@ -460,7 +460,7 @@ nsXULElement::nsXULElement()
       mBindingParent(nsnull),
       mSlots(nsnull)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
     XUL_PROTOTYPE_ATTRIBUTE_METER(gNumElements);
 }
 

content/xul/content/src/nsXULPopupListener.cpp

@@ -146,7 +146,7 @@ private:
 XULPopupListenerImpl::XULPopupListenerImpl(void)
   : mElement(nsnull), mPopupContent(nsnull)
 {
-	NS_INIT_REFCNT();	
+	NS_INIT_ISUPPORTS();	
 }
 
 XULPopupListenerImpl::~XULPopupListenerImpl(void)

content/xul/document/src/nsXULCommandDispatcher.cpp

@@ -79,7 +79,7 @@ static PRLogModuleInfo* gLog;
 nsXULCommandDispatcher::nsXULCommandDispatcher(nsIDocument* aDocument)
     : mFocusController(nsnull), mDocument(aDocument), mUpdaters(nsnull)
 {
-	NS_INIT_REFCNT();
+	NS_INIT_ISUPPORTS();
 
 #ifdef PR_LOGGING
   if (! gLog)

content/xul/document/src/nsXULContentSink.cpp

@@ -355,7 +355,7 @@ XULContentSinkImpl::XULContentSinkImpl(nsresult& rv)
       mState(eInProlog),
       mParser(nsnull)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 
     if (gRefCnt++ == 0) {
         rv = nsComponentManager::CreateInstance(kNameSpaceManagerCID,

content/xul/document/src/nsXULControllers.cpp

@@ -59,7 +59,7 @@
 nsXULControllers::nsXULControllers()
 : mCurControllerID(0)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsXULControllers::~nsXULControllers(void)

content/xul/document/src/nsXULDocument.cpp

@@ -243,7 +243,7 @@ private:
 public:
   nsProxyLoadStream(void) : mBuffer(nsnull)
   {
-      NS_INIT_REFCNT();
+      NS_INIT_ISUPPORTS();
   }
 
   virtual ~nsProxyLoadStream(void) {
@@ -380,7 +380,7 @@ PlaceHolderRequest::Create(nsIRequest** aResult)
 
 PlaceHolderRequest::PlaceHolderRequest()
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 
     if (gRefCnt++ == 0) {
         nsresult rv;
@@ -431,7 +431,7 @@ nsXULDocument::nsXULDocument(void)
       mCurrentScriptProto(nsnull),
       mBroadcasterMap(nsnull)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
     mCharSetID.Assign(NS_LITERAL_STRING("UTF-8"));
 
     // Force initialization.
@@ -6951,7 +6951,7 @@ nsXULDocument::CachedChromeStreamListener::CachedChromeStreamListener(nsXULDocum
     : mDocument(aDocument),
       mProtoLoaded(aProtoLoaded)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
     NS_ADDREF(mDocument);
 }
 
@@ -7007,7 +7007,7 @@ nsXULDocument::CachedChromeStreamListener::OnDataAvailable(nsIRequest *request,
 nsXULDocument::ParserObserver::ParserObserver(nsXULDocument* aDocument)
     : mDocument(aDocument)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
     NS_ADDREF(mDocument);
 }
 
@@ -7131,7 +7131,7 @@ PRInt32 XULElementFactoryImpl::kNameSpaceID_XUL;
 
 XULElementFactoryImpl::XULElementFactoryImpl()
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 
     if (!gIsInitialized) {
         nsCOMPtr<nsINameSpaceManager> nsmgr =

content/xul/document/src/nsXULPrototypeCache.cpp

@@ -194,7 +194,7 @@ nsIFile*              nsXULPrototypeCache::gFastLoadFile = nsnull;
 nsXULPrototypeCache::nsXULPrototypeCache()
     : mJSRuntime(nsnull)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 }
 
 
@@ -759,7 +759,7 @@ class nsXULFastLoadFileIO : public nsIFastLoadFileIO
   public:
     nsXULFastLoadFileIO(nsIFile* aFile)
       : mFile(aFile) {
-        NS_INIT_REFCNT();
+        NS_INIT_ISUPPORTS();
         MOZ_COUNT_CTOR(nsXULFastLoadFileIO);
     }
 

content/xul/document/src/nsXULPrototypeDocument.cpp

@@ -227,7 +227,7 @@ nsXULPrototypeDocument::nsXULPrototypeDocument()
       mGlobalObject(nsnull),
       mLoaded(PR_FALSE)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 }
 
 
@@ -731,7 +731,7 @@ nsXULPDGlobalObject::nsXULPDGlobalObject()
     : mJSObject(nsnull),
       mGlobalObjectOwner(nsnull)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 }
 
 

content/xul/templates/src/nsXULSortService.cpp

@@ -224,7 +224,7 @@ PRInt32 XULSortServiceImpl::kNameSpaceID_RDF;
 
 XULSortServiceImpl::XULSortServiceImpl(void)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   if (gRefCnt == 0) {
     kStaticHintAtom = NS_NewAtom("staticHint");
     kStaticsSortLastHintAtom   = NS_NewAtom("sortStaticsLast");

content/xul/templates/src/nsXULTemplateBuilder.cpp

@@ -161,7 +161,7 @@ nsXULTemplateBuilder::nsXULTemplateBuilder(void)
       mFlags(0),
       mTop(nsnull)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 }
 
 nsXULTemplateBuilder::~nsXULTemplateBuilder(void)

db/mork/build/nsMorkFactory.cpp

@@ -97,7 +97,7 @@ nsMorkFactoryFactory::QueryInterface(REFNSIID iid, void** result)
 
 nsMorkFactoryFactory::nsMorkFactoryFactory()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 NS_IMETHODIMP nsMorkFactoryFactory::GetMdbFactory(nsIMdbFactory **aFactory)

db/mork/src/morkObject.cpp

@@ -95,7 +95,7 @@ morkObject::morkObject(const morkUsage& inUsage, nsIMdbHeap* ioHeap,
 : morkBead(inUsage, ioHeap, inBeadColor)
 , mObject_Handle( 0 )
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mMorkEnv = nsnull;
 }
 
@@ -107,7 +107,7 @@ morkObject::morkObject(morkEnv* ev,
 , mObject_Handle( 0 )
 {
   mMorkEnv = ev;
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   if ( ev->Good() )
   {
     if ( ioHandle )

db/mork/src/orkinRow.cpp

@@ -113,7 +113,7 @@ orkinRow::orkinRow(morkEnv* ev, // morkUsage is morkUsage_kPool
     morkRowObject* ioObject)  // must not be nil, the object for this handle
 : morkHandle(ev, ioFace, ioObject, morkMagic_kRow)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   // do not modify mNode_Derived; leave it equal to morkDerived_kHandle
 }
 

docshell/base/nsDSURIContentListener.cpp

@@ -34,7 +34,7 @@
 nsDSURIContentListener::nsDSURIContentListener() : mDocShell(nsnull), 
     mParentContentListener(nsnull)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 }
 
 nsDSURIContentListener::~nsDSURIContentListener()

docshell/base/nsDocShell.cpp

@@ -220,7 +220,7 @@ nsDocShell::nsDocShell():
     mTreeOwner(nsnull),
     mChromeEventHandler(nsnull)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 #ifdef PR_LOGGING
     if (! gDocShellLog)
         gDocShellLog = PR_NewLogModule("nsDocShell");
@@ -6565,7 +6565,7 @@ nsDocShell::IsBeingDestroyed(PRBool *aDoomed)
 nsRefreshTimer::nsRefreshTimer():mRepeat(PR_FALSE), mDelay(0),
 mMetaRefresh(PR_FALSE)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 }
 
 nsRefreshTimer::~nsRefreshTimer()
@@ -6677,7 +6677,7 @@ nsDocShellFocusController::ClosingDown(nsIDocShell* aDocShell)
 //*****************************************************************************  
 nsDocShell::InterfaceRequestorProxy::InterfaceRequestorProxy(nsIInterfaceRequestor* p)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
     if (p) {
         mWeakPtr = getter_AddRefs(NS_GetWeakReference(p));
     }

docshell/base/nsDocShellEnumerator.cpp

@@ -32,7 +32,7 @@ nsDocShellEnumerator::nsDocShellEnumerator(PRInt32 inEnumerationDirection)
 , mDocShellType(nsIDocShellTreeItem::typeAll)
 , mEnumerationDirection(inEnumerationDirection)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsDocShellEnumerator::~nsDocShellEnumerator()

docshell/base/nsDocShellLoadInfo.cpp

@@ -31,7 +31,7 @@
 
 nsDocShellLoadInfo::nsDocShellLoadInfo()
 {
-	NS_INIT_REFCNT();
+	NS_INIT_ISUPPORTS();
    mLoadType = nsIDocShellLoadInfo::loadNormal;
    mInheritOwner = PR_FALSE;
 }

docshell/base/nsWebShell.cpp

@@ -175,7 +175,7 @@ nsWebShell::nsWebShell() : nsDocShell()
     printf("WEBSHELL+ = %ld\n", gNumberOfWebShells);
 #endif
 
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mThread = nsnull;
   InitFrameData();
   mItemType = typeContent;

dom/src/base/nsBarProps.cpp

@@ -56,7 +56,7 @@
 //
 BarPropImpl::BarPropImpl() : mBrowserChrome(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 BarPropImpl::~BarPropImpl()

dom/src/base/nsDOMClassInfo.cpp

@@ -1024,7 +1024,7 @@ nsDOMClassInfo::ThrowJSException(JSContext *cx, nsresult aResult)
 
 nsDOMClassInfo::nsDOMClassInfo(nsDOMClassInfoData* aData) : mData(aData)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 nsDOMClassInfo::~nsDOMClassInfo()

dom/src/base/nsDOMWindowList.cpp

@@ -57,7 +57,7 @@
 
 nsDOMWindowList::nsDOMWindowList(nsIDocShell *aDocShell)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   SetDocShell(aDocShell);
 }
 

dom/src/base/nsFocusController.cpp

@@ -61,7 +61,7 @@ nsFocusController::nsFocusController(void)
   mActive(PR_FALSE),
   mUpdateWindowWatcher(PR_FALSE)
 {
-	NS_INIT_REFCNT();
+	NS_INIT_ISUPPORTS();
 }
 
 nsFocusController::~nsFocusController(void)

dom/src/base/nsGlobalWindow.cpp

@@ -205,7 +205,7 @@ GlobalWindowImpl::GlobalWindowImpl() :
   mDocShell(nsnull), mMutationBits(0), mChromeEventHandler(nsnull),
   mFrameElement(nsnull)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   // We could have failed the first time through trying
   // to create the entropy collector, so we should
   // try to get one until we succeed.
@@ -5364,7 +5364,7 @@ NavigatorImpl::NavigatorImpl(nsIDocShell *aDocShell) :
   mPlugins(nsnull),
   mDocShell(aDocShell)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 NavigatorImpl::~NavigatorImpl()
@@ -5911,7 +5911,7 @@ NS_INTERFACE_MAP_END
 
 nsDOMWindowController::nsDOMWindowController(nsIDOMWindowInternal *aWindow)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mWindow = aWindow;
 
   // Set mBrowseWithCaret so we don't need to check pref every time

dom/src/base/nsHistory.cpp

@@ -58,7 +58,7 @@
 //
 HistoryImpl::HistoryImpl(nsIDocShell* aDocShell) : mDocShell(aDocShell)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 HistoryImpl::~HistoryImpl()

dom/src/base/nsJSEnvironment.cpp

@@ -386,7 +386,7 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
 
 nsJSContext::nsJSContext(JSRuntime *aRuntime) : mGCOnDestruction(PR_TRUE)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   ++sContextCount;
 

dom/src/base/nsLocation.cpp

@@ -106,7 +106,7 @@ static nsresult GetDocumentCharacterSetForURI(const nsAString& aHref, nsACString
 
 LocationImpl::LocationImpl(nsIDocShell *aDocShell)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
   mDocShell = aDocShell; // Weak Reference
 }
 

dom/src/base/nsScreen.cpp

@@ -55,7 +55,7 @@
 //
 ScreenImpl::ScreenImpl(nsIDocShell* aDocShell) : mDocShell(aDocShell)
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 ScreenImpl::~ScreenImpl()

dom/src/build/nsDOMFactory.cpp

@@ -113,7 +113,7 @@ public:
 
 nsDOMSOFactory::nsDOMSOFactory()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   nsCOMPtr<nsIObserverService> observerService =
     do_GetService("@mozilla.org/observer-service;1");

dom/src/events/nsJSEventListener.cpp

@@ -53,7 +53,7 @@
 nsJSEventListener::nsJSEventListener(nsIScriptContext *aContext, 
                                      nsISupports *aObject) 
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 
   // mObject is a weak reference. We are guaranteed
   // because of the ownership model that this object will be

dom/src/jsurl/nsJSProtocolHandler.cpp

@@ -711,7 +711,7 @@ nsJSChannel::SetContentLength(PRInt32 aContentLength)
 
 nsJSProtocolHandler::nsJSProtocolHandler()
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 }
 
 nsresult

editor/composer/src/nsComposerCommands.cpp

@@ -80,7 +80,7 @@ nsresult GetListItemState(nsIEditor *aEditor, PRBool *aMixed, PRUnichar **_retva
 
 nsBaseComposerCommand::nsBaseComposerCommand()
 {
-  NS_INIT_REFCNT();
+  NS_INIT_ISUPPORTS();
 }
 
 NS_IMPL_ISUPPORTS1(nsBaseComposerCommand, nsIControllerCommand)