From 9911a9b756fdb717fe917a0caf9c8e486bc28589 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Wed, 5 Apr 2006 00:00:44 +0000 Subject: [PATCH] Remove uses of MOZ_DECL_CTOR_COUNTER, which is always defined to nothing. b=332745 rs=roc,bzbarsky git-svn-id: svn://10.0.0.236/trunk@193572 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsImageLoadingContent.cpp | 1 - mozilla/content/base/src/nsImageLoadingContent.h | 2 -- .../content/html/document/src/nsHTMLContentSink.cpp | 2 -- mozilla/content/xbl/src/nsBindingManager.cpp | 2 -- mozilla/content/xbl/src/nsXBLProtoImpl.h | 2 -- mozilla/content/xbl/src/nsXBLProtoImplField.cpp | 2 -- mozilla/content/xbl/src/nsXBLProtoImplMember.h | 2 -- mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp | 2 -- mozilla/content/xbl/src/nsXBLProtoImplMethod.h | 4 ---- mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp | 2 -- mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp | 2 -- mozilla/content/xbl/src/nsXBLPrototypeResources.cpp | 2 -- mozilla/content/xbl/src/nsXBLResourceLoader.h | 2 -- mozilla/content/xul/content/src/nsXULElement.h | 2 -- .../xul/document/src/nsXULPrototypeCache.cpp | 3 --- .../inspector/base/src/inDeepTreeWalker.cpp | 2 -- mozilla/extensions/wallet/src/singsign.cpp | 8 -------- mozilla/extensions/wallet/src/wallet.cpp | 7 ------- mozilla/extensions/xforms/nsXFormsMDGEngine.cpp | 2 -- mozilla/extensions/xforms/nsXFormsXPathAnalyzer.cpp | 2 -- mozilla/extensions/xforms/nsXFormsXPathNode.cpp | 2 -- mozilla/extensions/xforms/nsXFormsXPathParser.cpp | 2 -- mozilla/extensions/xforms/nsXFormsXPathScanner.cpp | 2 -- mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp | 2 -- mozilla/gfx/src/gtk/nsGCCache.cpp | 2 -- mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp | 2 -- mozilla/gfx/src/nsDeviceContext.cpp | 2 -- mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp | 2 -- mozilla/gfx/src/xlib/nsRenderingContextXlib.cpp | 2 -- mozilla/js/src/xpconnect/src/xpccontext.cpp | 2 -- .../js/src/xpconnect/src/xpcwrappednativeproto.cpp | 2 -- .../js/src/xpconnect/src/xpcwrappednativescope.cpp | 2 -- mozilla/layout/base/nsDisplayList.cpp | 4 ---- mozilla/layout/base/nsDisplayList.h | 6 ------ mozilla/layout/base/nsFrameManager.cpp | 3 --- mozilla/layout/base/nsLayoutUtils.cpp | 1 - mozilla/layout/base/nsStyleChangeList.cpp | 2 -- mozilla/layout/forms/nsButtonFrameRenderer.cpp | 4 ---- mozilla/layout/forms/nsComboboxControlFrame.cpp | 1 - mozilla/layout/forms/nsFieldSetFrame.cpp | 1 - mozilla/layout/forms/nsFormControlHelper.cpp | 2 -- mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp | 1 - mozilla/layout/forms/nsGfxRadioControlFrame.cpp | 1 - mozilla/layout/generic/nsBulletFrame.cpp | 1 - mozilla/layout/generic/nsFrame.cpp | 13 ------------- mozilla/layout/generic/nsFrameSetFrame.cpp | 2 -- mozilla/layout/generic/nsHTMLContainerFrame.cpp | 1 - mozilla/layout/generic/nsImageFrame.cpp | 1 - mozilla/layout/generic/nsImageMap.cpp | 2 -- mozilla/layout/generic/nsLineBox.cpp | 8 -------- mozilla/layout/generic/nsLineLayout.cpp | 2 -- mozilla/layout/generic/nsSpaceManager.cpp | 6 ------ mozilla/layout/generic/nsTextFrame.cpp | 1 - mozilla/layout/generic/nsTextTransformer.cpp | 2 -- mozilla/layout/mathml/base/src/nsMathMLChar.cpp | 8 -------- .../mathml/base/src/nsMathMLContainerFrame.cpp | 1 - mozilla/layout/mathml/base/src/nsMathMLFrame.cpp | 2 -- mozilla/layout/style/nsCSSDeclaration.cpp | 2 -- mozilla/layout/style/nsCSSRuleProcessor.cpp | 2 -- mozilla/layout/style/nsCSSScanner.cpp | 2 -- mozilla/layout/style/nsCSSStruct.cpp | 2 -- mozilla/layout/style/nsCSSStruct.h | 2 -- mozilla/layout/style/nsCSSStyleRule.cpp | 12 ------------ mozilla/layout/style/nsCSSStyleSheet.cpp | 2 -- mozilla/layout/style/nsCSSValue.h | 6 ------ mozilla/layout/style/nsDOMCSSAttrDeclaration.cpp | 2 -- mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp | 1 - mozilla/layout/tables/BasicTableLayoutStrategy.cpp | 3 --- mozilla/layout/tables/nsCellMap.cpp | 4 ---- mozilla/layout/tables/nsTableCellFrame.cpp | 1 - mozilla/layout/tables/nsTableFrame.cpp | 1 - mozilla/layout/tables/nsTablePainter.h | 2 -- mozilla/layout/tables/nsTableRowFrame.cpp | 1 - mozilla/layout/xul/base/src/nsBox.cpp | 2 -- mozilla/layout/xul/base/src/nsBoxFrame.cpp | 1 - mozilla/layout/xul/base/src/nsGroupBoxFrame.cpp | 1 - mozilla/layout/xul/base/src/nsImageBoxFrame.cpp | 1 - mozilla/layout/xul/base/src/nsTextBoxFrame.cpp | 1 - .../layout/xul/base/src/tree/src/nsTreeColFrame.cpp | 1 - mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp | 6 ------ mozilla/mailnews/addrbook/src/nsMapiAddressBook.cpp | 2 -- mozilla/mailnews/addrbook/src/nsWabAddressBook.cpp | 2 -- mozilla/mailnews/base/src/nsMsgCopyService.cpp | 4 ---- mozilla/mailnews/base/src/nsSubscribableServer.cpp | 2 -- mozilla/mailnews/base/util/nsMsgGroupRecord.cpp | 2 -- mozilla/mailnews/base/util/nsMsgIncomingServer.cpp | 2 -- mozilla/mailnews/base/util/nsMsgKeySet.cpp | 3 --- mozilla/mailnews/base/util/nsMsgLineBuffer.cpp | 4 ---- mozilla/mailnews/base/util/nsUInt32Array.cpp | 2 -- mozilla/mailnews/base/util/nsUint8Array.cpp | 2 -- mozilla/modules/libjar/nsZipArchive.cpp | 6 ------ mozilla/modules/libjar/zipstub.h | 1 - mozilla/modules/oji/src/nsCSecurityContext.cpp | 2 -- mozilla/parser/htmlparser/src/CParserContext.cpp | 2 -- mozilla/parser/htmlparser/src/nsDTDUtils.cpp | 5 ----- mozilla/parser/htmlparser/src/nsScanner.cpp | 2 -- mozilla/parser/htmlparser/src/nsToken.cpp | 5 ----- mozilla/rdf/base/src/nsRDFContentSink.cpp | 2 -- .../security/manager/ssl/src/nsKeygenHandler.cpp | 3 --- mozilla/view/src/nsView.cpp | 2 -- mozilla/widget/src/gtk/nsGtkIMEHelper.cpp | 1 - mozilla/xpcom/ds/nsDeque.cpp | 2 -- mozilla/xpcom/ds/nsEmptyEnumerator.cpp | 2 -- mozilla/xpcom/ds/nsHashtable.cpp | 2 -- mozilla/xpcom/io/nsFastLoadFile.cpp | 4 ---- mozilla/xpcom/reflect/xptinfo/src/xptiFile.cpp | 2 -- mozilla/xpcom/reflect/xptinfo/src/xptiMisc.cpp | 2 -- .../xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp | 2 -- mozilla/xpcom/reflect/xptinfo/src/xptiZipItem.cpp | 2 -- mozilla/xpfe/components/intl/nsCharsetMenu.cpp | 2 -- mozilla/xpinstall/src/nsAppleSingleDecoder.cpp | 3 --- mozilla/xpinstall/src/nsInstall.cpp | 4 ---- mozilla/xpinstall/src/nsInstallExecute.cpp | 2 -- mozilla/xpinstall/src/nsInstallFile.cpp | 2 -- mozilla/xpinstall/src/nsInstallFileOpItem.cpp | 2 -- mozilla/xpinstall/src/nsInstallFolder.cpp | 2 -- mozilla/xpinstall/src/nsInstallLogComment.cpp | 2 -- mozilla/xpinstall/src/nsInstallPatch.cpp | 2 -- mozilla/xpinstall/src/nsInstallUninstall.cpp | 2 -- mozilla/xpinstall/src/nsRegisterItem.cpp | 2 -- mozilla/xpinstall/src/nsWinProfile.cpp | 2 -- mozilla/xpinstall/src/nsWinProfileItem.cpp | 2 -- mozilla/xpinstall/src/nsWinReg.cpp | 2 -- mozilla/xpinstall/src/nsWinRegItem.cpp | 2 -- mozilla/xpinstall/src/nsXPITriggerInfo.cpp | 3 --- 125 files changed, 321 deletions(-) diff --git a/mozilla/content/base/src/nsImageLoadingContent.cpp b/mozilla/content/base/src/nsImageLoadingContent.cpp index 5c64d65bb46..6b68a15cd93 100644 --- a/mozilla/content/base/src/nsImageLoadingContent.cpp +++ b/mozilla/content/base/src/nsImageLoadingContent.cpp @@ -717,7 +717,6 @@ nsImageLoadingContent::StringToURI(const nsAString& aSpec, /** * Struct used to dispatch events */ -MOZ_DECL_CTOR_COUNTER(ImageEvent) class ImageEvent : public PLEvent { diff --git a/mozilla/content/base/src/nsImageLoadingContent.h b/mozilla/content/base/src/nsImageLoadingContent.h index 77d353e535f..1de698457cd 100644 --- a/mozilla/content/base/src/nsImageLoadingContent.h +++ b/mozilla/content/base/src/nsImageLoadingContent.h @@ -141,8 +141,6 @@ private: * Struct used to manage the image observers. */ struct ImageObserver { - MOZ_DECL_CTOR_COUNTER(ImageObserver) - ImageObserver(imgIDecoderObserver* aObserver) : mObserver(aObserver), mNext(nsnull) diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index c4c217d37da..cbfa0c4ae11 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -1008,8 +1008,6 @@ MakeContentObject(nsHTMLTag aNodeType, nsINodeInfo *aNodeInfo, //---------------------------------------------------------------------- -MOZ_DECL_CTOR_COUNTER(SinkContext) - SinkContext::SinkContext(HTMLContentSink* aSink) : mSink(aSink), mNotifyLevel(0), diff --git a/mozilla/content/xbl/src/nsBindingManager.cpp b/mozilla/content/xbl/src/nsBindingManager.cpp index e1d35fccc9e..205d9dfbeae 100644 --- a/mozilla/content/xbl/src/nsBindingManager.cpp +++ b/mozilla/content/xbl/src/nsBindingManager.cpp @@ -104,8 +104,6 @@ private: nsVoidArray* mElements; }; -MOZ_DECL_CTOR_COUNTER(nsAnonymousContentList) - nsAnonymousContentList::nsAnonymousContentList(nsVoidArray* aElements) : mElements(aElements) { diff --git a/mozilla/content/xbl/src/nsXBLProtoImpl.h b/mozilla/content/xbl/src/nsXBLProtoImpl.h index c861abcadb5..ee7aee08503 100644 --- a/mozilla/content/xbl/src/nsXBLProtoImpl.h +++ b/mozilla/content/xbl/src/nsXBLProtoImpl.h @@ -46,8 +46,6 @@ class nsIXPConnectJSObjectHolder; -MOZ_DECL_CTOR_COUNTER(nsXBLProtoImpl) - class nsXBLProtoImpl { public: diff --git a/mozilla/content/xbl/src/nsXBLProtoImplField.cpp b/mozilla/content/xbl/src/nsXBLProtoImplField.cpp index b0fe3a81eb8..286f031c56e 100644 --- a/mozilla/content/xbl/src/nsXBLProtoImplField.cpp +++ b/mozilla/content/xbl/src/nsXBLProtoImplField.cpp @@ -47,8 +47,6 @@ #include "nsIScriptContext.h" #include "nsContentUtils.h" -MOZ_DECL_CTOR_COUNTER(nsXBLProtoImplField) - nsXBLProtoImplField::nsXBLProtoImplField(const PRUnichar* aName, const PRUnichar* aReadOnly) : nsXBLProtoImplMember(aName), mFieldText(nsnull), diff --git a/mozilla/content/xbl/src/nsXBLProtoImplMember.h b/mozilla/content/xbl/src/nsXBLProtoImplMember.h index 3ccf2fff688..4372678aa54 100644 --- a/mozilla/content/xbl/src/nsXBLProtoImplMember.h +++ b/mozilla/content/xbl/src/nsXBLProtoImplMember.h @@ -52,8 +52,6 @@ class nsIScriptContext; struct JSRuntime; class nsIJSRuntimeService; -MOZ_DECL_CTOR_COUNTER(nsXBLTextWithLineNumber) - struct nsXBLTextWithLineNumber { PRUnichar* mText; diff --git a/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp b/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp index b3a73a21a53..5b3f971b21e 100644 --- a/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp +++ b/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp @@ -51,8 +51,6 @@ #include "nsIScriptSecurityManager.h" #include "nsIXPConnect.h" -MOZ_DECL_CTOR_COUNTER(nsXBLProtoImplMethod) - nsXBLProtoImplMethod::nsXBLProtoImplMethod(const PRUnichar* aName) : nsXBLProtoImplMember(aName), mUncompiledMethod(nsnull) diff --git a/mozilla/content/xbl/src/nsXBLProtoImplMethod.h b/mozilla/content/xbl/src/nsXBLProtoImplMethod.h index c689302977f..d414657fc56 100644 --- a/mozilla/content/xbl/src/nsXBLProtoImplMethod.h +++ b/mozilla/content/xbl/src/nsXBLProtoImplMethod.h @@ -46,8 +46,6 @@ #include "nsString.h" #include "nsXBLProtoImplMember.h" -MOZ_DECL_CTOR_COUNTER(nsXBLParameter) - struct nsXBLParameter { nsXBLParameter* mNext; char* mName; @@ -65,8 +63,6 @@ struct nsXBLParameter { } }; -MOZ_DECL_CTOR_COUNTER(nsXBLUncompiledMethod) - struct nsXBLUncompiledMethod { nsXBLParameter* mParameters; nsXBLParameter* mLastParameter; diff --git a/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp b/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp index 0c99e39086c..a948f36a8fc 100644 --- a/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp +++ b/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp @@ -49,8 +49,6 @@ #include "nsIScriptGlobalObject.h" #include "nsContentUtils.h" -MOZ_DECL_CTOR_COUNTER(nsXBLProtoImplProperty) - nsXBLProtoImplProperty::nsXBLProtoImplProperty(const PRUnichar* aName, const PRUnichar* aGetter, const PRUnichar* aSetter, diff --git a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp index 80355695ee9..05a1d0297c6 100644 --- a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp +++ b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp @@ -229,8 +229,6 @@ static const PRInt32 kInsInitialSize = (NS_SIZE_IN_HEAP(sizeof(nsXBLInsertionPoi // Implementation ///////////////////////////////////////////////////////////////// -MOZ_DECL_CTOR_COUNTER(nsXBLPrototypeBinding) - // Constructors/Destructors nsXBLPrototypeBinding::nsXBLPrototypeBinding() : mImplementation(nsnull), diff --git a/mozilla/content/xbl/src/nsXBLPrototypeResources.cpp b/mozilla/content/xbl/src/nsXBLPrototypeResources.cpp index 2cdfe012686..44ce175c2ea 100644 --- a/mozilla/content/xbl/src/nsXBLPrototypeResources.cpp +++ b/mozilla/content/xbl/src/nsXBLPrototypeResources.cpp @@ -53,8 +53,6 @@ static NS_DEFINE_CID(kCSSLoaderCID, NS_CSS_LOADER_CID); -MOZ_DECL_CTOR_COUNTER(nsXBLPrototypeResources) - nsXBLPrototypeResources::nsXBLPrototypeResources(nsXBLPrototypeBinding* aBinding) { MOZ_COUNT_CTOR(nsXBLPrototypeResources); diff --git a/mozilla/content/xbl/src/nsXBLResourceLoader.h b/mozilla/content/xbl/src/nsXBLResourceLoader.h index dea8fc1804d..f90bb2800ab 100644 --- a/mozilla/content/xbl/src/nsXBLResourceLoader.h +++ b/mozilla/content/xbl/src/nsXBLResourceLoader.h @@ -51,8 +51,6 @@ class nsXBLPrototypeBinding; // *********************************************************************/ // The XBLResourceLoader class -MOZ_DECL_CTOR_COUNTER(nsXBLResource) - struct nsXBLResource { nsXBLResource* mNext; nsIAtom* mType; diff --git a/mozilla/content/xul/content/src/nsXULElement.h b/mozilla/content/xul/content/src/nsXULElement.h index 545bf649008..9c06f4022fa 100644 --- a/mozilla/content/xul/content/src/nsXULElement.h +++ b/mozilla/content/xul/content/src/nsXULElement.h @@ -110,8 +110,6 @@ static NS_DEFINE_CID(kCSSParserCID, NS_CSSPARSER_CID); */ -MOZ_DECL_CTOR_COUNTER(nsXULPrototypeAttribute) - class nsXULPrototypeAttribute { public: diff --git a/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp b/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp index fdef981bbe5..ddc4f031a40 100644 --- a/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp +++ b/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp @@ -710,11 +710,9 @@ class nsXULFastLoadFileIO : public nsIFastLoadFileIO public: nsXULFastLoadFileIO(nsIFile* aFile) : mFile(aFile) { - MOZ_COUNT_CTOR(nsXULFastLoadFileIO); } virtual ~nsXULFastLoadFileIO() { - MOZ_COUNT_DTOR(nsXULFastLoadFileIO); } NS_DECL_ISUPPORTS @@ -727,7 +725,6 @@ class nsXULFastLoadFileIO : public nsIFastLoadFileIO NS_IMPL_THREADSAFE_ISUPPORTS1(nsXULFastLoadFileIO, nsIFastLoadFileIO) -MOZ_DECL_CTOR_COUNTER(nsXULFastLoadFileIO) NS_IMETHODIMP diff --git a/mozilla/extensions/inspector/base/src/inDeepTreeWalker.cpp b/mozilla/extensions/inspector/base/src/inDeepTreeWalker.cpp index a357eefa2d2..8de38bbadce 100644 --- a/mozilla/extensions/inspector/base/src/inDeepTreeWalker.cpp +++ b/mozilla/extensions/inspector/base/src/inDeepTreeWalker.cpp @@ -53,8 +53,6 @@ //////////////////////////////////////////////////// -MOZ_DECL_CTOR_COUNTER(DeepTreeStackItem) - struct DeepTreeStackItem { DeepTreeStackItem() { MOZ_COUNT_CTOR(DeepTreeStackItem); } diff --git a/mozilla/extensions/wallet/src/singsign.cpp b/mozilla/extensions/wallet/src/singsign.cpp index a72d945db04..7244d854441 100644 --- a/mozilla/extensions/wallet/src/singsign.cpp +++ b/mozilla/extensions/wallet/src/singsign.cpp @@ -657,8 +657,6 @@ SecondsFromPRTime(PRTime prTime) { return seconds; } -MOZ_DECL_CTOR_COUNTER(si_SignonDataStruct) - si_SignonDataStruct::si_SignonDataStruct() : isPassword(PR_FALSE) { @@ -669,8 +667,6 @@ si_SignonDataStruct::~si_SignonDataStruct() MOZ_COUNT_DTOR(si_SignonDataStruct); } -MOZ_DECL_CTOR_COUNTER(si_SignonUserStruct) - class si_SignonUserStruct { public: si_SignonUserStruct() @@ -688,8 +684,6 @@ public: nsVoidArray signonData_list; // elements are si_SignonDataStruct }; -MOZ_DECL_CTOR_COUNTER(si_SignonURLStruct) - class si_SignonURLStruct { public: si_SignonURLStruct() : passwordRealm(NULL), chosen_user(NULL) @@ -705,8 +699,6 @@ public: nsVoidArray signonUser_list; }; -MOZ_DECL_CTOR_COUNTER(si_Reject) - class si_Reject { public: si_Reject() : passwordRealm(NULL) diff --git a/mozilla/extensions/wallet/src/wallet.cpp b/mozilla/extensions/wallet/src/wallet.cpp index ad9655bdda8..804cf4e7d2d 100644 --- a/mozilla/extensions/wallet/src/wallet.cpp +++ b/mozilla/extensions/wallet/src/wallet.cpp @@ -165,8 +165,6 @@ wallet_GetEnabledPref(void) enum PlacementType {DUP_IGNORE, DUP_OVERWRITE, DUP_BEFORE, DUP_AFTER, AT_END, BY_LENGTH}; #define LIST_COUNT(list) ((list) ? (list)->Count() : 0) -MOZ_DECL_CTOR_COUNTER(wallet_Sublist) - class wallet_Sublist { public: wallet_Sublist() @@ -189,7 +187,6 @@ public: * item2 is a value. Therefore this generic data structure refers to them simply as * item1 and item2. */ -MOZ_DECL_CTOR_COUNTER(wallet_MapElement) class wallet_MapElement { public: @@ -224,8 +221,6 @@ public: * only once and left sitting on the heap */ -MOZ_DECL_CTOR_COUNTER(wallet_HelpMac) - class wallet_HelpMac { public: wallet_HelpMac() { @@ -253,8 +248,6 @@ static nsVoidArray * wallet_DistinguishedSchema_list = 0; #define NO_CAPTURE(x) x[0] #define NO_PREVIEW(x) x[1] -MOZ_DECL_CTOR_COUNTER(wallet_PrefillElement) - class wallet_PrefillElement { public: wallet_PrefillElement() : inputElement(nsnull), selectElement(nsnull) diff --git a/mozilla/extensions/xforms/nsXFormsMDGEngine.cpp b/mozilla/extensions/xforms/nsXFormsMDGEngine.cpp index f49558bc018..aec12916776 100644 --- a/mozilla/extensions/xforms/nsXFormsMDGEngine.cpp +++ b/mozilla/extensions/xforms/nsXFormsMDGEngine.cpp @@ -64,7 +64,6 @@ /* ------------------------------------ */ /* --------- nsXFormsMDGNode ---------- */ /* ------------------------------------ */ -MOZ_DECL_CTOR_COUNTER(nsXFormsMDGNode) nsXFormsMDGNode::nsXFormsMDGNode(nsIDOMNode *aNode, const ModelItemPropName aType) @@ -122,7 +121,6 @@ nsXFormsMDGNode::MarkClean() /* ------------------------------------ */ /* -------- nsXFormsMDGEngine --------- */ /* ------------------------------------ */ -MOZ_DECL_CTOR_COUNTER(nsXFormsMDGEngine) nsXFormsMDGEngine::nsXFormsMDGEngine() : mNodesInGraph(0) diff --git a/mozilla/extensions/xforms/nsXFormsXPathAnalyzer.cpp b/mozilla/extensions/xforms/nsXFormsXPathAnalyzer.cpp index a1541f7d40a..04ed9d373a6 100644 --- a/mozilla/extensions/xforms/nsXFormsXPathAnalyzer.cpp +++ b/mozilla/extensions/xforms/nsXFormsXPathAnalyzer.cpp @@ -45,8 +45,6 @@ //#define DEBUG_XF_ANALYZER #endif -MOZ_DECL_CTOR_COUNTER(nsXFormsXPathAnalyzer) - nsXFormsXPathAnalyzer::nsXFormsXPathAnalyzer(nsIXFormsXPathEvaluator *aEvaluator, nsIDOMNode *aResolver) : mEvaluator(aEvaluator), mResolver(aResolver) diff --git a/mozilla/extensions/xforms/nsXFormsXPathNode.cpp b/mozilla/extensions/xforms/nsXFormsXPathNode.cpp index 00340e73591..15682ceeea3 100644 --- a/mozilla/extensions/xforms/nsXFormsXPathNode.cpp +++ b/mozilla/extensions/xforms/nsXFormsXPathNode.cpp @@ -40,8 +40,6 @@ #include "nsXFormsXPathNode.h" #include "nsCOMPtr.h" -MOZ_DECL_CTOR_COUNTER(nsXFormsXPathNode) - nsXFormsXPathNode::nsXFormsXPathNode(nsXFormsXPathNode* aParent, PRBool aContinue) : mChild(nsnull), mEndIndex(-100), mCon(aContinue), mIsIndex(PR_FALSE) { diff --git a/mozilla/extensions/xforms/nsXFormsXPathParser.cpp b/mozilla/extensions/xforms/nsXFormsXPathParser.cpp index ce45b80854b..1e94d1cf7ca 100644 --- a/mozilla/extensions/xforms/nsXFormsXPathParser.cpp +++ b/mozilla/extensions/xforms/nsXFormsXPathParser.cpp @@ -59,8 +59,6 @@ XPathCompilerException(const char *aMsg, } -MOZ_DECL_CTOR_COUNTER(nsXFormsXPathParser) - nsXFormsXPathParser::nsXFormsXPathParser() : mUsesDynamicFunc(PR_FALSE), mHead(nsnull), mAnalyzeStackPointer(nsnull) { diff --git a/mozilla/extensions/xforms/nsXFormsXPathScanner.cpp b/mozilla/extensions/xforms/nsXFormsXPathScanner.cpp index c467f29bf98..f99581d728b 100644 --- a/mozilla/extensions/xforms/nsXFormsXPathScanner.cpp +++ b/mozilla/extensions/xforms/nsXFormsXPathScanner.cpp @@ -40,8 +40,6 @@ #include "nsXFormsXPathScanner.h" #include "nsXFormsXPathXMLUtil.h" -MOZ_DECL_CTOR_COUNTER(nsXFormsXPathScanner) - nsXFormsXPathScanner::nsXFormsXPathScanner() { MOZ_COUNT_CTOR(nsXFormsXPathScanner); diff --git a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp index 8473d862f8d..504395fcba2 100644 --- a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp +++ b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp @@ -2783,8 +2783,6 @@ nsFontGTK::IsFreeTypeFont(void) return PR_FALSE; } -MOZ_DECL_CTOR_COUNTER(nsFontGTK) - nsFontGTK::nsFontGTK() { MOZ_COUNT_CTOR(nsFontGTK); diff --git a/mozilla/gfx/src/gtk/nsGCCache.cpp b/mozilla/gfx/src/gtk/nsGCCache.cpp index 85ec16a835e..8c8851268be 100644 --- a/mozilla/gfx/src/gtk/nsGCCache.cpp +++ b/mozilla/gfx/src/gtk/nsGCCache.cpp @@ -50,8 +50,6 @@ GdkRegion *nsGCCache::copyRegion = NULL; -MOZ_DECL_CTOR_COUNTER(nsGCCache) - nsGCCache::nsGCCache() { MOZ_COUNT_CTOR(nsGCCache); diff --git a/mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp b/mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp index db1de20cf80..f21541d11ad 100644 --- a/mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp +++ b/mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp @@ -63,8 +63,6 @@ int PR_CALLBACK nsUnicodeMappingUtil::PrefChangedCallback( const char* aPrefName return 0; } -MOZ_DECL_CTOR_COUNTER(nsUnicodeMappingUtil) - nsUnicodeMappingUtil::nsUnicodeMappingUtil() { Init(); diff --git a/mozilla/gfx/src/nsDeviceContext.cpp b/mozilla/gfx/src/nsDeviceContext.cpp index 3f0a831c0d9..7e299a00bd8 100644 --- a/mozilla/gfx/src/nsDeviceContext.cpp +++ b/mozilla/gfx/src/nsDeviceContext.cpp @@ -566,8 +566,6 @@ NS_IMETHODIMP DeviceContextImpl::SetUseAltDC(PRUint8 aValue, PRBool aOn) ///////////////////////////////////////////////////////////// -MOZ_DECL_CTOR_COUNTER(nsFontCache) - nsFontCache::nsFontCache() { MOZ_COUNT_CTOR(nsFontCache); diff --git a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp index 93b78629035..b721685e294 100644 --- a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp +++ b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp @@ -3161,8 +3161,6 @@ nsFontXlib::IsFreeTypeFont(void) } #endif /* MOZ_ENABLE_FREETYPE2 */ -MOZ_DECL_CTOR_COUNTER(nsFontXlib) - nsFontXlib::nsFontXlib() { MOZ_COUNT_CTOR(nsFontXlib); diff --git a/mozilla/gfx/src/xlib/nsRenderingContextXlib.cpp b/mozilla/gfx/src/xlib/nsRenderingContextXlib.cpp index 9603877bca3..a9659a2da6e 100644 --- a/mozilla/gfx/src/xlib/nsRenderingContextXlib.cpp +++ b/mozilla/gfx/src/xlib/nsRenderingContextXlib.cpp @@ -109,8 +109,6 @@ public: nsCOMPtr mFontMetrics; }; -MOZ_DECL_CTOR_COUNTER(GraphicsState) - GraphicsState::GraphicsState() : mMatrix(nsnull), mColor(NS_RGB(0, 0, 0)), diff --git a/mozilla/js/src/xpconnect/src/xpccontext.cpp b/mozilla/js/src/xpconnect/src/xpccontext.cpp index 756ed850a73..f4dfae5bdcd 100644 --- a/mozilla/js/src/xpconnect/src/xpccontext.cpp +++ b/mozilla/js/src/xpconnect/src/xpccontext.cpp @@ -57,8 +57,6 @@ XPCContext::newXPCContext(XPCJSRuntime* aRuntime, return new XPCContext(aRuntime, aJSContext); } -MOZ_DECL_CTOR_COUNTER(XPCContext) - XPCContext::XPCContext(XPCJSRuntime* aRuntime, JSContext* aJSContext) : mRuntime(aRuntime), diff --git a/mozilla/js/src/xpconnect/src/xpcwrappednativeproto.cpp b/mozilla/js/src/xpconnect/src/xpcwrappednativeproto.cpp index e0c9139f230..7d33f211399 100644 --- a/mozilla/js/src/xpconnect/src/xpcwrappednativeproto.cpp +++ b/mozilla/js/src/xpconnect/src/xpcwrappednativeproto.cpp @@ -46,8 +46,6 @@ PRInt32 XPCWrappedNativeProto::gDEBUG_LiveProtoCount = 0; #endif -MOZ_DECL_CTOR_COUNTER(XPCWrappedNativeProto) - XPCWrappedNativeProto::XPCWrappedNativeProto(XPCWrappedNativeScope* Scope, nsIClassInfo* ClassInfo, PRUint32 ClassInfoFlags, diff --git a/mozilla/js/src/xpconnect/src/xpcwrappednativescope.cpp b/mozilla/js/src/xpconnect/src/xpcwrappednativescope.cpp index 50411b09f1e..245fcbd7d51 100644 --- a/mozilla/js/src/xpconnect/src/xpcwrappednativescope.cpp +++ b/mozilla/js/src/xpconnect/src/xpcwrappednativescope.cpp @@ -129,8 +129,6 @@ XPCWrappedNativeScope::GetNewOrUsed(XPCCallContext& ccx, JSObject* aGlobal) return scope; } -MOZ_DECL_CTOR_COUNTER(XPCWrappedNativeScope) - XPCWrappedNativeScope::XPCWrappedNativeScope(XPCCallContext& ccx, JSObject* aGlobal) : mRuntime(ccx.GetRuntime()), diff --git a/mozilla/layout/base/nsDisplayList.cpp b/mozilla/layout/base/nsDisplayList.cpp index 50646511715..1123017e69f 100644 --- a/mozilla/layout/base/nsDisplayList.cpp +++ b/mozilla/layout/base/nsDisplayList.cpp @@ -596,8 +596,6 @@ nsresult nsDisplayWrapper::WrapListsInPlace(nsDisplayListBuilder* aBuilder, return WrapEachDisplayItem(aBuilder, aLists.Outlines(), this); } -MOZ_DECL_CTOR_COUNTER(nsDisplayOpacity) - nsDisplayOpacity::nsDisplayOpacity(nsIFrame* aFrame, nsDisplayList* aList) : nsDisplayWrapList(aFrame, aList), mNeedAlpha(PR_TRUE) { MOZ_COUNT_CTOR(nsDisplayOpacity); @@ -726,8 +724,6 @@ PRBool nsDisplayOpacity::TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* return PR_TRUE; } -MOZ_DECL_CTOR_COUNTER(nsDisplayClip) - nsDisplayClip::nsDisplayClip(nsIFrame* aFrame, nsDisplayItem* aItem, const nsRect& aRect) : nsDisplayWrapList(aFrame, aItem), mClip(aRect) { diff --git a/mozilla/layout/base/nsDisplayList.h b/mozilla/layout/base/nsDisplayList.h index 714be25daa9..b6427dd141f 100644 --- a/mozilla/layout/base/nsDisplayList.h +++ b/mozilla/layout/base/nsDisplayList.h @@ -716,7 +716,6 @@ private: * custom display item class could be, and fractionally slower. However it does * save code size. We use this for infrequently-used item types. */ -MOZ_DECL_CTOR_COUNTER(nsDisplayGeneric) class nsDisplayGeneric : public nsDisplayItem { public: typedef void (* PaintCallback)(nsIFrame* aFrame, nsIRenderingContext* aCtx, @@ -751,7 +750,6 @@ protected: /** * The standard display item to paint the CSS borders of a frame. */ -MOZ_DECL_CTOR_COUNTER(nsDisplayBorder) class nsDisplayBorder : public nsDisplayItem { public: nsDisplayBorder(nsIFrame* aFrame) : nsDisplayItem(aFrame) { @@ -771,7 +769,6 @@ public: /** * The standard display item to paint the CSS background of a frame. */ -MOZ_DECL_CTOR_COUNTER(nsDisplayBackground) class nsDisplayBackground : public nsDisplayItem { public: nsDisplayBackground(nsIFrame* aFrame) : nsDisplayItem(aFrame) { @@ -796,7 +793,6 @@ public: /** * The standard display item to paint the CSS outline of a frame. */ -MOZ_DECL_CTOR_COUNTER(nsDisplayOutline) class nsDisplayOutline : public nsDisplayItem { public: nsDisplayOutline(nsIFrame* aFrame) : nsDisplayItem(aFrame) { @@ -818,7 +814,6 @@ public: /** * A class that lets you receive events within the frame bounds but never paints. */ -MOZ_DECL_CTOR_COUNTER(nsDisplayEventReceiver) class nsDisplayEventReceiver : public nsDisplayItem { public: nsDisplayEventReceiver(nsIFrame* aFrame) : nsDisplayItem(aFrame) { @@ -926,7 +921,6 @@ protected: * The standard display item to paint a stacking context with translucency * set by the stacking context root frame's 'opacity' style. */ -MOZ_DECL_CTOR_COUNTER(nsDisplayOpacity) class nsDisplayOpacity : public nsDisplayWrapList { public: nsDisplayOpacity(nsIFrame* aFrame, nsDisplayList* aList); diff --git a/mozilla/layout/base/nsFrameManager.cpp b/mozilla/layout/base/nsFrameManager.cpp index fa8a8431cda..e120e01be70 100644 --- a/mozilla/layout/base/nsFrameManager.cpp +++ b/mozilla/layout/base/nsFrameManager.cpp @@ -200,7 +200,6 @@ static PLDHashTableOps PrimaryFrameMapOps = { // XXXldb This seems too complicated for what I think it's doing, and it // should also be using pldhash rather than plhash to use less memory. -MOZ_DECL_CTOR_COUNTER(UndisplayedNode) class UndisplayedNode { public: @@ -1572,8 +1571,6 @@ CompareKeys(void* key1, void* key2) //---------------------------------------------------------------------- -MOZ_DECL_CTOR_COUNTER(UndisplayedMap) - nsFrameManagerBase::UndisplayedMap::UndisplayedMap(PRUint32 aNumBuckets) { MOZ_COUNT_CTOR(nsFrameManagerBase::UndisplayedMap); diff --git a/mozilla/layout/base/nsLayoutUtils.cpp b/mozilla/layout/base/nsLayoutUtils.cpp index 455f30a3848..e5c3469d430 100644 --- a/mozilla/layout/base/nsLayoutUtils.cpp +++ b/mozilla/layout/base/nsLayoutUtils.cpp @@ -639,7 +639,6 @@ nsLayoutUtils::GetFrameForPoint(nsIFrame* aFrame, nsPoint aPt) * A simple display item that just renders a solid color across the entire * visible area. */ -MOZ_DECL_CTOR_COUNTER(nsDisplaySolidColor) class nsDisplaySolidColor : public nsDisplayItem { public: nsDisplaySolidColor(nsIFrame* aFrame, nscolor aColor) diff --git a/mozilla/layout/base/nsStyleChangeList.cpp b/mozilla/layout/base/nsStyleChangeList.cpp index 13195783f0a..13be26bdfc2 100644 --- a/mozilla/layout/base/nsStyleChangeList.cpp +++ b/mozilla/layout/base/nsStyleChangeList.cpp @@ -48,8 +48,6 @@ static const PRUint32 kGrowArrayBy = 10; -MOZ_DECL_CTOR_COUNTER(nsStyleChangeList) - nsStyleChangeList::nsStyleChangeList(void) : mArray(mBuffer), mArraySize(kStyleChangeBufferSize), diff --git a/mozilla/layout/forms/nsButtonFrameRenderer.cpp b/mozilla/layout/forms/nsButtonFrameRenderer.cpp index 0f350c9108b..3bc74a91378 100644 --- a/mozilla/layout/forms/nsButtonFrameRenderer.cpp +++ b/mozilla/layout/forms/nsButtonFrameRenderer.cpp @@ -50,8 +50,6 @@ #define HOVER "hover" #define FOCUS "focus" -MOZ_DECL_CTOR_COUNTER(nsButtonFrameRenderer) - nsButtonFrameRenderer::nsButtonFrameRenderer() { MOZ_COUNT_CTOR(nsButtonFrameRenderer); @@ -93,7 +91,6 @@ nsButtonFrameRenderer::isDisabled() nsHTMLAtoms::disabled); } -MOZ_DECL_CTOR_COUNTER(nsDisplayButtonBorderBackground) class nsDisplayButtonBorderBackground : public nsDisplayItem { public: nsDisplayButtonBorderBackground(nsButtonFrameRenderer* aRenderer) @@ -116,7 +113,6 @@ private: nsButtonFrameRenderer* mBFR; }; -MOZ_DECL_CTOR_COUNTER(nsDisplayButtonForeground) class nsDisplayButtonForeground : public nsDisplayItem { public: nsDisplayButtonForeground(nsButtonFrameRenderer* aRenderer) diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index bcc582c006e..eb9257d5c52 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -2055,7 +2055,6 @@ nsComboboxControlFrame::UpdateRecentIndex(PRInt32 aIndex) return index; } -MOZ_DECL_CTOR_COUNTER(nsDisplayComboboxFocus) class nsDisplayComboboxFocus : public nsDisplayItem { public: nsDisplayComboboxFocus(nsComboboxControlFrame* aFrame) diff --git a/mozilla/layout/forms/nsFieldSetFrame.cpp b/mozilla/layout/forms/nsFieldSetFrame.cpp index a0690c150ae..466c4797276 100644 --- a/mozilla/layout/forms/nsFieldSetFrame.cpp +++ b/mozilla/layout/forms/nsFieldSetFrame.cpp @@ -163,7 +163,6 @@ nsFieldSetFrame::SetInitialChildList(nsPresContext* aPresContext, return nsHTMLContainerFrame::SetInitialChildList(aPresContext, nsnull, aChildList); } -MOZ_DECL_CTOR_COUNTER(nsDisplayFieldSetBorderBackground) class nsDisplayFieldSetBorderBackground : public nsDisplayItem { public: nsDisplayFieldSetBorderBackground(nsFieldSetFrame* aFrame) diff --git a/mozilla/layout/forms/nsFormControlHelper.cpp b/mozilla/layout/forms/nsFormControlHelper.cpp index 727f322d4f5..93de5133a31 100644 --- a/mozilla/layout/forms/nsFormControlHelper.cpp +++ b/mozilla/layout/forms/nsFormControlHelper.cpp @@ -80,8 +80,6 @@ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); #define kTextControl_Wrap_Off "OFF" -MOZ_DECL_CTOR_COUNTER(nsFormControlHelper) - nsFormControlHelper::nsFormControlHelper() { MOZ_COUNT_CTOR(nsFormControlHelper); diff --git a/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp b/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp index ccf60de1418..e981db968d8 100644 --- a/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp @@ -167,7 +167,6 @@ static void PaintCheckMarkFromStyle(nsIFrame* aFrame, ->PaintCheckBoxFromStyle(*aCtx, aPt, aDirtyRect); } -MOZ_DECL_CTOR_COUNTER(nsDisplayCheckMark) class nsDisplayCheckMark : public nsDisplayItem { public: nsDisplayCheckMark(nsGfxCheckboxControlFrame* aFrame) diff --git a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp index 94eca33a642..53c42d2a8a6 100644 --- a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp @@ -175,7 +175,6 @@ nsGfxRadioControlFrame::PaintRadioButtonFromStyle( aDirtyRect, rect, *myBorder, mRadioButtonFaceStyle, 0); } -MOZ_DECL_CTOR_COUNTER(nsDisplayRadioButtonFromStyle) class nsDisplayRadioButtonFromStyle : public nsDisplayItem { public: nsDisplayRadioButtonFromStyle(nsGfxRadioControlFrame* aFrame) diff --git a/mozilla/layout/generic/nsBulletFrame.cpp b/mozilla/layout/generic/nsBulletFrame.cpp index 4a835cfc438..c7415a42200 100644 --- a/mozilla/layout/generic/nsBulletFrame.cpp +++ b/mozilla/layout/generic/nsBulletFrame.cpp @@ -173,7 +173,6 @@ nsBulletFrame::DidSetStyleContext() return NS_OK; } -MOZ_DECL_CTOR_COUNTER(nsDisplayBullet) class nsDisplayBullet : public nsDisplayItem { public: nsDisplayBullet(nsBulletFrame* aFrame) : nsDisplayItem(aFrame) { diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 74b087cb599..3cd73fd29f0 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -458,8 +458,6 @@ NS_NewEmptyFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) return new (aPresShell) nsFrame(aContext); } -MOZ_DECL_CTOR_COUNTER(nsFrame) - // Overloaded new operator. Initializes the memory to 0 and relies on an arena // (which comes from the presShell) to perform the allocation. void* @@ -772,7 +770,6 @@ nsFrame::DisplaySelection(nsPresContext* aPresContext, PRBool isOkToTurnOn) return selType; } -MOZ_DECL_CTOR_COUNTER(nsDisplaySelectionOverlay) class nsDisplaySelectionOverlay : public nsDisplayItem { public: nsDisplaySelectionOverlay(nsFrame* aFrame, PRInt16 aSelectionValue) @@ -6179,8 +6176,6 @@ nsFrame::VerifyDirtyBitSet(nsIFrame* aFrameList) // Start Display Reflow #ifdef DEBUG -MOZ_DECL_CTOR_COUNTER(DR_cookie) - DR_cookie::DR_cookie(nsPresContext* aPresContext, nsIFrame* aFrame, const nsHTMLReflowState& aReflowState, @@ -6266,8 +6261,6 @@ void DR_RulePart::Destroy() delete this; } -MOZ_DECL_CTOR_COUNTER(DR_Rule) - struct DR_Rule { DR_Rule() : mLength(0), mTarget(nsnull), mDisplay(PR_FALSE) { @@ -6292,8 +6285,6 @@ void DR_Rule::AddPart(nsIAtom* aFrameType) mLength++; } -MOZ_DECL_CTOR_COUNTER(DR_FrameTypeInfo) - struct DR_FrameTypeInfo { DR_FrameTypeInfo(nsIAtom* aFrmeType, const char* aFrameNameAbbrev, const char* aFrameName); @@ -6322,8 +6313,6 @@ DR_FrameTypeInfo::DR_FrameTypeInfo(nsIAtom* aFrameType, MOZ_COUNT_CTOR(DR_FrameTypeInfo); } -MOZ_DECL_CTOR_COUNTER(DR_FrameTreeNode) - struct DR_FrameTreeNode { DR_FrameTreeNode(nsIFrame* aFrame, DR_FrameTreeNode* aParent) : mFrame(aFrame), mParent(aParent), mDisplay(0), mIndent(0) @@ -6344,8 +6333,6 @@ struct DR_FrameTreeNode // DR_State implementation -MOZ_DECL_CTOR_COUNTER(DR_State) - DR_State::DR_State() : mInited(PR_FALSE), mActive(PR_FALSE), mCount(0), mAssert(-1), mIndentStart(0), mIndentUndisplayedFrames(PR_FALSE), mDisplayPixelErrors(PR_FALSE) diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp index 2defca30671..c799c0a414c 100644 --- a/mozilla/layout/generic/nsFrameSetFrame.cpp +++ b/mozilla/layout/generic/nsFrameSetFrame.cpp @@ -1626,7 +1626,6 @@ nsHTMLFramesetBorderFrame::Reflow(nsPresContext* aPresContext, return NS_OK; } -MOZ_DECL_CTOR_COUNTER(nsDisplayFramesetBorder) class nsDisplayFramesetBorder : public nsDisplayItem { public: nsDisplayFramesetBorder(nsHTMLFramesetBorderFrame* aFrame) @@ -1828,7 +1827,6 @@ nsHTMLFramesetBlankFrame::Reflow(nsPresContext* aPresContext, return NS_OK; } -MOZ_DECL_CTOR_COUNTER(nsDisplayFramesetBlank) class nsDisplayFramesetBlank : public nsDisplayItem { public: nsDisplayFramesetBlank(nsIFrame* aFrame) : nsDisplayItem(aFrame) { diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp index 6def62e424c..0c8f20d2eff 100644 --- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp @@ -69,7 +69,6 @@ #include "nsLineBox.h" #include "nsDisplayList.h" -MOZ_DECL_CTOR_COUNTER(nsDisplayTextDecoration) class nsDisplayTextDecoration : public nsDisplayItem { public: nsDisplayTextDecoration(nsHTMLContainerFrame* aFrame, PRUint8 aDecoration, diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 360e94ff973..a3d5a706635 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -1262,7 +1262,6 @@ static void PaintDebugImageMap(nsIFrame* aFrame, nsIRenderingContext* aCtx, * image itself, and hence receive events just as if the image itself * received events. */ -MOZ_DECL_CTOR_COUNTER(nsDisplayImage) class nsDisplayImage : public nsDisplayItem { public: nsDisplayImage(nsImageFrame* aFrame, imgIContainer* aImage) diff --git a/mozilla/layout/generic/nsImageMap.cpp b/mozilla/layout/generic/nsImageMap.cpp index d4c1cf3a6e9..85689acd79e 100644 --- a/mozilla/layout/generic/nsImageMap.cpp +++ b/mozilla/layout/generic/nsImageMap.cpp @@ -96,8 +96,6 @@ public: PRPackedBool mHasFocus; }; -MOZ_DECL_CTOR_COUNTER(Area) - Area::Area(nsIContent* aArea) : mArea(aArea) { diff --git a/mozilla/layout/generic/nsLineBox.cpp b/mozilla/layout/generic/nsLineBox.cpp index 46595e66970..9be2d157899 100644 --- a/mozilla/layout/generic/nsLineBox.cpp +++ b/mozilla/layout/generic/nsLineBox.cpp @@ -57,8 +57,6 @@ static PRInt32 ctorCount; PRInt32 nsLineBox::GetCtorCount() { return ctorCount; } #endif -MOZ_DECL_CTOR_COUNTER(nsLineBox) - nsLineBox::nsLineBox(nsIFrame* aFrame, PRInt32 aCount, PRBool aIsBlock) : mFirstChild(aFrame), mBounds(0, 0, 0, 0), @@ -816,8 +814,6 @@ nsLineIterator::GetNextSiblingOnLine(nsIFrame*& aFrame, PRInt32 aLineNumber) //---------------------------------------------------------------------- -MOZ_DECL_CTOR_COUNTER(nsFloatCacheList) - #ifdef NS_BUILD_REFCNT_LOGGING nsFloatCacheList::nsFloatCacheList() : mHead(nsnull) @@ -896,8 +892,6 @@ nsFloatCacheList::Remove(nsFloatCache* aElement) //---------------------------------------------------------------------- -MOZ_DECL_CTOR_COUNTER(nsFloatCacheFreeList) - #ifdef NS_BUILD_REFCNT_LOGGING nsFloatCacheFreeList::nsFloatCacheFreeList() : mTail(nsnull) @@ -963,8 +957,6 @@ nsFloatCacheFreeList::Append(nsFloatCache* aFloat) //---------------------------------------------------------------------- -MOZ_DECL_CTOR_COUNTER(nsFloatCache) - nsFloatCache::nsFloatCache() : mPlaceholder(nsnull), mIsCurrentLineFloat(PR_TRUE), diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp index e3254ba4da1..8bede05d2f3 100644 --- a/mozilla/layout/generic/nsLineLayout.cpp +++ b/mozilla/layout/generic/nsLineLayout.cpp @@ -150,8 +150,6 @@ static PRBool InUnconstrainedTableCell(const nsHTMLReflowState& aBlockReflowStat #endif -MOZ_DECL_CTOR_COUNTER(nsLineLayout) - nsLineLayout::nsLineLayout(nsPresContext* aPresContext, nsSpaceManager* aSpaceManager, const nsHTMLReflowState* aOuterReflowState, diff --git a/mozilla/layout/generic/nsSpaceManager.cpp b/mozilla/layout/generic/nsSpaceManager.cpp index d3e0dccebb3..b128e28abd9 100644 --- a/mozilla/layout/generic/nsSpaceManager.cpp +++ b/mozilla/layout/generic/nsSpaceManager.cpp @@ -108,8 +108,6 @@ PSArenaFreeCB(size_t aSize, void* aPtr, void* aClosure) ///////////////////////////////////////////////////////////////////////////// // nsSpaceManager -MOZ_DECL_CTOR_COUNTER(nsSpaceManager) - nsSpaceManager::nsSpaceManager(nsIPresShell* aPresShell, nsIFrame* aFrame) : mFrame(aFrame), mLowestTop(NSCOORD_MIN), @@ -1272,8 +1270,6 @@ nsSpaceManager::ClearFloats(nscoord aY, PRUint8 aBreakType) ///////////////////////////////////////////////////////////////////////////// // FrameInfo -MOZ_DECL_CTOR_COUNTER(nsSpaceManager::FrameInfo) - nsSpaceManager::FrameInfo::FrameInfo(nsIFrame* aFrame, const nsRect& aRect) : mFrame(aFrame), mRect(aRect), mNext(0) { @@ -1290,8 +1286,6 @@ nsSpaceManager::FrameInfo::~FrameInfo() ///////////////////////////////////////////////////////////////////////////// // BandRect -MOZ_DECL_CTOR_COUNTER(BandRect) - nsSpaceManager::BandRect::BandRect(nscoord aLeft, nscoord aTop, nscoord aRight, diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index a0b69b56f7a..9689ab80ab7 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -1951,7 +1951,6 @@ nsTextFrame::CharacterDataChanged(nsPresContext* aPresContext, // When we fix nsTextFrame to handle bearing (character glyphs that // extend outside the frame) by giving it overflow area, we'll need to fix // this to use the overflow area as its bounds. -MOZ_DECL_CTOR_COUNTER(nsDisplayText) class nsDisplayText : public nsDisplayItem { public: nsDisplayText(nsTextFrame* aFrame) : nsDisplayItem(aFrame) { diff --git a/mozilla/layout/generic/nsTextTransformer.cpp b/mozilla/layout/generic/nsTextTransformer.cpp index bdef7854328..532783e80e6 100644 --- a/mozilla/layout/generic/nsTextTransformer.cpp +++ b/mozilla/layout/generic/nsTextTransformer.cpp @@ -170,8 +170,6 @@ nsTextTransformer::Shutdown() #define MAX_UNIBYTE 127 -MOZ_DECL_CTOR_COUNTER(nsTextTransformer) - nsTextTransformer::nsTextTransformer(nsPresContext* aPresContext) : mFrag(nsnull), mOffset(0), diff --git a/mozilla/layout/mathml/base/src/nsMathMLChar.cpp b/mozilla/layout/mathml/base/src/nsMathMLChar.cpp index 9bcdf01bba9..e7a144ef244 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLChar.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLChar.cpp @@ -216,8 +216,6 @@ GetStretchyDirection(PRUnichar aChar) // ----------------------------------------------------------------------------------- -MOZ_DECL_CTOR_COUNTER(nsGlyphTable) - class nsGlyphTable { public: nsGlyphTable(const nsString& aPrimaryFontName) @@ -648,8 +646,6 @@ DHASH_WRAPPER(nsBaseFontHashtable, nsBaseFontEntry, PRInt32) // user' system. The class is an XPCOM shutdown observer to allow us to // free its allocated data at shutdown -MOZ_DECL_CTOR_COUNTER(nsGlyphTableList) - class nsGlyphTableList : public nsIObserver { public: @@ -1923,7 +1919,6 @@ nsMathMLChar::ComposeChildren(nsPresContext* aPresContext, return NS_OK; } -MOZ_DECL_CTOR_COUNTER(nsDisplayMathMLSelectionRect) class nsDisplayMathMLSelectionRect : public nsDisplayItem { public: nsDisplayMathMLSelectionRect(nsIFrame* aFrame, const nsRect& aRect) @@ -1954,7 +1949,6 @@ void nsDisplayMathMLSelectionRect::Paint(nsDisplayListBuilder* aBuilder, aCtx->FillRect(mRect + aBuilder->ToReferenceFrame(mFrame)); } -MOZ_DECL_CTOR_COUNTER(nsDisplayMathMLCharBackground) class nsDisplayMathMLCharBackground : public nsDisplayItem { public: nsDisplayMathMLCharBackground(nsIFrame* aFrame, const nsRect& aRect, @@ -1989,7 +1983,6 @@ void nsDisplayMathMLCharBackground::Paint(nsDisplayListBuilder* aBuilder, PR_TRUE); } -MOZ_DECL_CTOR_COUNTER(nsDisplayMathMLCharForeground) class nsDisplayMathMLCharForeground : public nsDisplayItem { public: nsDisplayMathMLCharForeground(nsIFrame* aFrame, nsMathMLChar* aChar, @@ -2019,7 +2012,6 @@ void nsDisplayMathMLCharForeground::Paint(nsDisplayListBuilder* aBuilder, } #ifdef NS_DEBUG -MOZ_DECL_CTOR_COUNTER(nsDisplayMathMLCharDebug) class nsDisplayMathMLCharDebug : public nsDisplayItem { public: nsDisplayMathMLCharDebug(nsIFrame* aFrame, const nsRect& aRect) diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp index 9b4bf2c1e55..47d26ef3d65 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp @@ -126,7 +126,6 @@ nsMathMLContainerFrame::ReflowError(nsIRenderingContext& aRenderingContext, return NS_OK; } -MOZ_DECL_CTOR_COUNTER(nsDisplayMathMLError) class nsDisplayMathMLError : public nsDisplayItem { public: nsDisplayMathMLError(nsIFrame* aFrame) diff --git a/mozilla/layout/mathml/base/src/nsMathMLFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLFrame.cpp index a15f142e4e5..0c35b26f48a 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLFrame.cpp @@ -728,7 +728,6 @@ nsMathMLFrame::MapAttributesIntoCSS(nsPresContext* aPresContext, } #if defined(NS_DEBUG) && defined(SHOW_BOUNDING_BOX) -MOZ_DECL_CTOR_COUNTER(nsDisplayMathMLBoundingMetrics) class nsDisplayMathMLBoundingMetrics : public nsDisplayItem { public: nsDisplayMathMLBoundingMetrics(nsIFrame* aFrame, const nsRect& aRect) @@ -773,7 +772,6 @@ nsMathMLFrame::DisplayBoundingMetrics(nsDisplayListBuilder* aBuilder, } #endif -MOZ_DECL_CTOR_COUNTER(nsDisplayMathMLBar) class nsDisplayMathMLBar : public nsDisplayItem { public: nsDisplayMathMLBar(nsIFrame* aFrame, const nsRect& aRect) diff --git a/mozilla/layout/style/nsCSSDeclaration.cpp b/mozilla/layout/style/nsCSSDeclaration.cpp index 5b3d3ba88f6..9a21fe59419 100644 --- a/mozilla/layout/style/nsCSSDeclaration.cpp +++ b/mozilla/layout/style/nsCSSDeclaration.cpp @@ -82,8 +82,6 @@ #define B_BORDER 0xfff -MOZ_DECL_CTOR_COUNTER(nsCSSDeclaration) - nsCSSDeclaration::nsCSSDeclaration() : mOrder(eCSSProperty_COUNT_no_shorthands, 8), mData(nsnull), diff --git a/mozilla/layout/style/nsCSSRuleProcessor.cpp b/mozilla/layout/style/nsCSSRuleProcessor.cpp index 55134df3e84..5e419df0693 100644 --- a/mozilla/layout/style/nsCSSRuleProcessor.cpp +++ b/mozilla/layout/style/nsCSSRuleProcessor.cpp @@ -719,8 +719,6 @@ nsCSSRuleProcessor::~nsCSSRuleProcessor() NS_IMPL_ISUPPORTS1(nsCSSRuleProcessor, nsIStyleRuleProcessor) -MOZ_DECL_CTOR_COUNTER(RuleProcessorData) - RuleProcessorData::RuleProcessorData(nsPresContext* aPresContext, nsIContent* aContent, nsRuleWalker* aRuleWalker, diff --git a/mozilla/layout/style/nsCSSScanner.cpp b/mozilla/layout/style/nsCSSScanner.cpp index 7fc56cb0d03..edc00943796 100644 --- a/mozilla/layout/style/nsCSSScanner.cpp +++ b/mozilla/layout/style/nsCSSScanner.cpp @@ -181,8 +181,6 @@ nsCSSToken::AppendToString(nsString& aBuffer) } } -MOZ_DECL_CTOR_COUNTER(nsCSSScanner) - nsCSSScanner::nsCSSScanner() : mInputStream(nsnull) , mReadPointer(nsnull) diff --git a/mozilla/layout/style/nsCSSStruct.cpp b/mozilla/layout/style/nsCSSStruct.cpp index d3ea22da21a..1bd7a93ca01 100644 --- a/mozilla/layout/style/nsCSSStruct.cpp +++ b/mozilla/layout/style/nsCSSStruct.cpp @@ -360,8 +360,6 @@ void nsCSSValuePair::AppendToString(nsAString& aString, // --- nsCSSValueListRect ----------------- -MOZ_DECL_CTOR_COUNTER(nsCSSValueListRect) - nsCSSValueListRect::nsCSSValueListRect(void) : mTop(nsnull), mRight(nsnull), diff --git a/mozilla/layout/style/nsCSSStruct.h b/mozilla/layout/style/nsCSSStruct.h index 68ee972c339..f9f9cabbf37 100644 --- a/mozilla/layout/style/nsCSSStruct.h +++ b/mozilla/layout/style/nsCSSStruct.h @@ -193,8 +193,6 @@ struct nsCSSRect { static const side_type sides[4]; }; -MOZ_DECL_CTOR_COUNTER(nsCSSValuePair) - struct nsCSSValuePair { nsCSSValuePair() { diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp index b6fab624124..91a6b388f17 100644 --- a/mozilla/layout/style/nsCSSStyleRule.cpp +++ b/mozilla/layout/style/nsCSSStyleRule.cpp @@ -87,8 +87,6 @@ #define NS_IF_DELETE(ptr) \ if (ptr) { delete ptr; ptr = nsnull; } -MOZ_DECL_CTOR_COUNTER(nsAtomList) - nsAtomList::nsAtomList(nsIAtom* aAtom) : mAtom(aAtom), mNext(nsnull) @@ -134,8 +132,6 @@ PRBool nsAtomList::Equals(const nsAtomList* aOther) const return PR_FALSE; } -MOZ_DECL_CTOR_COUNTER(nsAtomStringList) - nsAtomStringList::nsAtomStringList(nsIAtom* aAtom, const PRUnichar* aString) : mAtom(aAtom), mString(nsnull), @@ -191,8 +187,6 @@ PRBool nsAtomStringList::Equals(const nsAtomStringList* aOther) const nsCaseInsensitiveStringComparator()))); } -MOZ_DECL_CTOR_COUNTER(nsAttrSelector) - nsAttrSelector::nsAttrSelector(PRInt32 aNameSpace, const nsString& aAttr) : mNameSpace(aNameSpace), mAttr(nsnull), @@ -262,8 +256,6 @@ PRBool nsAttrSelector::Equals(const nsAttrSelector* aOther) const return PR_FALSE; } -MOZ_DECL_CTOR_COUNTER(nsCSSSelector) - nsCSSSelector::nsCSSSelector(void) : mNameSpace(kNameSpaceID_Unknown), mTag(nsnull), mIDList(nsnull), @@ -746,8 +738,6 @@ void nsCSSSelector::ToStringInternal(nsAString& aString, // -- nsCSSSelectorList ------------------------------- -MOZ_DECL_CTOR_COUNTER(nsCSSSelectorList) - nsCSSSelectorList::nsCSSSelectorList(void) : mSelectors(nsnull), mWeight(0), @@ -953,8 +943,6 @@ protected: } }; -MOZ_DECL_CTOR_COUNTER(DOMCSSDeclarationImpl) - DOMCSSDeclarationImpl::DOMCSSDeclarationImpl(nsICSSStyleRule *aRule) : mRule(aRule) { diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp index 59219dd43a6..cac77bc5986 100644 --- a/mozilla/layout/style/nsCSSStyleSheet.cpp +++ b/mozilla/layout/style/nsCSSStyleSheet.cpp @@ -607,8 +607,6 @@ nsCSSStyleSheetInner::RebuildNameSpaces() // CSS Style Sheet // -MOZ_DECL_CTOR_COUNTER(nsCSSStyleSheet) - nsCSSStyleSheet::nsCSSStyleSheet() : nsICSSStyleSheet(), mRefCnt(0), diff --git a/mozilla/layout/style/nsCSSValue.h b/mozilla/layout/style/nsCSSValue.h index 98a1094e338..3401e28758d 100644 --- a/mozilla/layout/style/nsCSSValue.h +++ b/mozilla/layout/style/nsCSSValue.h @@ -290,8 +290,6 @@ public: nsCSSProperty aPropID = eCSSProperty_UNKNOWN) const; #endif - MOZ_DECL_CTOR_COUNTER(nsCSSValue::Array) - struct Array { // return |Array| with reference count of zero @@ -382,8 +380,6 @@ public: Array(const Array& aOther); // not to be implemented }; - MOZ_DECL_CTOR_COUNTER(nsCSSValue::URL) - struct URL { // Caller must delete this object immediately if the allocation of // |mString| fails. @@ -425,8 +421,6 @@ public: nsrefcnt mRefCnt; }; - MOZ_DECL_CTOR_COUNTER(nsCSSValue::Image) - struct Image : public URL { // Not making the constructor and destructor inline because that would // force us to include imgIRequest.h, which leads to REQUIRES hell, since diff --git a/mozilla/layout/style/nsDOMCSSAttrDeclaration.cpp b/mozilla/layout/style/nsDOMCSSAttrDeclaration.cpp index 27d086c5a56..b0ff2609b8f 100644 --- a/mozilla/layout/style/nsDOMCSSAttrDeclaration.cpp +++ b/mozilla/layout/style/nsDOMCSSAttrDeclaration.cpp @@ -51,8 +51,6 @@ #include "nsContentUtils.h" #include "nsIContent.h" -MOZ_DECL_CTOR_COUNTER(nsDOMCSSAttributeDeclaration) - nsDOMCSSAttributeDeclaration::nsDOMCSSAttributeDeclaration(nsIContent *aContent) { MOZ_COUNT_CTOR(nsDOMCSSAttributeDeclaration); diff --git a/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp b/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp index 08b77a4c554..32b2376ceb1 100644 --- a/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp @@ -586,7 +586,6 @@ nsSVGOuterSVGFrame::RemoveFrame(nsIAtom* aListName, return result ? NS_OK : NS_ERROR_FAILURE; } -MOZ_DECL_CTOR_COUNTER(nsDisplaySVG) class nsDisplaySVG : public nsDisplayItem { public: nsDisplaySVG(nsSVGOuterSVGFrame* aFrame) : nsDisplayItem(aFrame) { diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp index c8c33e10840..14f16cb69f0 100644 --- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp @@ -105,9 +105,6 @@ HasPctValue(const nsIFrame* aFrame) /* ---------- BasicTableLayoutStrategy ---------- */ -MOZ_DECL_CTOR_COUNTER(BasicTableLayoutStrategy) - - BasicTableLayoutStrategy::BasicTableLayoutStrategy(nsTableFrame *aFrame, PRBool aIsNavQuirks) { MOZ_COUNT_CTOR(BasicTableLayoutStrategy); diff --git a/mozilla/layout/tables/nsCellMap.cpp b/mozilla/layout/tables/nsCellMap.cpp index 95d8d8bb3f9..86ecce4cc0c 100644 --- a/mozilla/layout/tables/nsCellMap.cpp +++ b/mozilla/layout/tables/nsCellMap.cpp @@ -48,8 +48,6 @@ // CellData -MOZ_DECL_CTOR_COUNTER(CellData) - CellData::CellData(nsTableCellFrame* aOrigCell) { MOZ_COUNT_CTOR(CellData); @@ -72,8 +70,6 @@ BCCellData::~BCCellData() MOZ_COUNT_DTOR(BCCellData); } -MOZ_DECL_CTOR_COUNTER(nsCellMap) - // nsTableCellMap nsTableCellMap::nsTableCellMap(nsTableFrame& aTableFrame, diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index 85a26898aae..48b6de792c5 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/layout/tables/nsTableCellFrame.cpp @@ -352,7 +352,6 @@ nsTableCellFrame::PaintCellBackground(nsIRenderingContext& aRenderingContext, PaintBackground(aRenderingContext, aDirtyRect, aPt); } -MOZ_DECL_CTOR_COUNTER(nsDisplayTableCellBackground) class nsDisplayTableCellBackground : public nsDisplayItem { public: nsDisplayTableCellBackground(nsTableCellFrame* aFrame) : nsDisplayItem(aFrame) { diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index e6688ccabf0..1063e419b7e 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/layout/tables/nsTableFrame.cpp @@ -1338,7 +1338,6 @@ nsTableFrame::GetAdditionalChildListName(PRInt32 aIndex) const return nsnull; } -MOZ_DECL_CTOR_COUNTER(nsDisplayTableBorderBackground) class nsDisplayTableBorderBackground : public nsDisplayItem { public: nsDisplayTableBorderBackground(nsTableFrame* aFrame) : nsDisplayItem(aFrame) { diff --git a/mozilla/layout/tables/nsTablePainter.h b/mozilla/layout/tables/nsTablePainter.h index dcaf87b13ee..b893dbaaef5 100644 --- a/mozilla/layout/tables/nsTablePainter.h +++ b/mozilla/layout/tables/nsTablePainter.h @@ -168,7 +168,6 @@ class TableBackgroundPainter struct TableBackgroundData; friend struct TableBackgroundData; - MOZ_DECL_CTOR_COUNTER(TableBackgroundData) struct TableBackgroundData { nsIFrame* mFrame; /** mRect is the rect of mFrame in the current coordinate system */ @@ -243,6 +242,5 @@ class TableBackgroundPainter float mP2t; //pixels to twips }; -MOZ_DECL_CTOR_COUNTER(TableBackgroundPainter) #endif diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp index 352aaaf6593..e9fa6e52cfe 100644 --- a/mozilla/layout/tables/nsTableRowFrame.cpp +++ b/mozilla/layout/tables/nsTableRowFrame.cpp @@ -554,7 +554,6 @@ nsTableRowFrame::CalcHeight(const nsHTMLReflowState& aReflowState) * Table row backgrounds can extend beyond the row frame bounds, when * the row contains row-spanning cells. */ -MOZ_DECL_CTOR_COUNTER(nsDisplayTableRowBackground) class nsDisplayTableRowBackground : public nsDisplayItem { public: nsDisplayTableRowBackground(nsTableRowFrame* aFrame) : nsDisplayItem(aFrame) { diff --git a/mozilla/layout/xul/base/src/nsBox.cpp b/mozilla/layout/xul/base/src/nsBox.cpp index e7cc8bc543e..eedf9e04720 100644 --- a/mozilla/layout/xul/base/src/nsBox.cpp +++ b/mozilla/layout/xul/base/src/nsBox.cpp @@ -238,8 +238,6 @@ void Coelesced() PRBool nsBox::gGotTheme = PR_FALSE; nsITheme* nsBox::gTheme = nsnull; -MOZ_DECL_CTOR_COUNTER(nsBox) - nsBox::nsBox() { MOZ_COUNT_CTOR(nsBox); diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp index 45e46740c58..8ba6b60421a 100644 --- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp @@ -1369,7 +1369,6 @@ nsBoxFrame::GetDebugPref(nsPresContext* aPresContext) gDebug = nsContentUtils::GetBoolPref("xul.debug.box"); } -MOZ_DECL_CTOR_COUNTER(nsDisplayXULDebug) class nsDisplayXULDebug : public nsDisplayItem { public: nsDisplayXULDebug(nsIFrame* aFrame) : nsDisplayItem(aFrame) { diff --git a/mozilla/layout/xul/base/src/nsGroupBoxFrame.cpp b/mozilla/layout/xul/base/src/nsGroupBoxFrame.cpp index f374422c943..80884cb9b90 100644 --- a/mozilla/layout/xul/base/src/nsGroupBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsGroupBoxFrame.cpp @@ -100,7 +100,6 @@ NS_NewGroupBoxFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) return new (aPresShell) nsGroupBoxFrame(aPresShell, aContext); } -MOZ_DECL_CTOR_COUNTER(nsDisplayXULGroupBackground) class nsDisplayXULGroupBackground : public nsDisplayItem { public: nsDisplayXULGroupBackground(nsGroupBoxFrame* aFrame) : nsDisplayItem(aFrame) { diff --git a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp index bfb666778ff..aff75719991 100644 --- a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp @@ -386,7 +386,6 @@ nsImageBoxFrame::UpdateLoadFlags() mLoadFlags = nsIRequest::LOAD_NORMAL; } -MOZ_DECL_CTOR_COUNTER(nsDisplayXULImage) class nsDisplayXULImage : public nsDisplayItem { public: nsDisplayXULImage(nsImageBoxFrame* aFrame) : nsDisplayItem(aFrame) { diff --git a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp index eff561a773f..2488813c1b2 100644 --- a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp @@ -273,7 +273,6 @@ nsTextBoxFrame::UpdateAttributes(nsPresContext* aPresContext, } -MOZ_DECL_CTOR_COUNTER(nsDisplayXULTextBox) class nsDisplayXULTextBox : public nsDisplayItem { public: nsDisplayXULTextBox(nsTextBoxFrame* aFrame) : nsDisplayItem(aFrame) { diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.cpp index 10de1d571f6..157e831019a 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.cpp +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.cpp @@ -106,7 +106,6 @@ nsTreeColFrame::Destroy(nsPresContext* aPresContext) return nsBoxFrame::Destroy(aPresContext); } -MOZ_DECL_CTOR_COUNTER(nsDisplayXULTreeColSplitterTarget) class nsDisplayXULTreeColSplitterTarget : public nsDisplayItem { public: nsDisplayXULTreeColSplitterTarget(nsIFrame* aFrame) : nsDisplayItem(aFrame) { diff --git a/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp b/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp index fafe90563cd..fe19dca3ed8 100644 --- a/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp @@ -85,8 +85,6 @@ static void assignEntryID(LPENTRYID& aTarget, LPENTRYID aSource, ULONG aByteCoun } } -MOZ_DECL_CTOR_COUNTER(nsMapiEntry) - nsMapiEntry::nsMapiEntry(void) : mByteCount(0), mEntryId(NULL) { @@ -246,8 +244,6 @@ void nsMapiEntry::Dump(void) const PRINTF(("\n")) ; } -MOZ_DECL_CTOR_COUNTER(nsMapiEntryArray) - nsMapiEntryArray::nsMapiEntryArray(void) : mEntries(NULL), mNbEntries(0) { @@ -269,8 +265,6 @@ void nsMapiEntryArray::CleanUp(void) } } -MOZ_DECL_CTOR_COUNTER(nsAbWinHelper) - PRUint32 nsAbWinHelper::mEntryCounter = 0 ; // There seems to be a deadlock/auto-destruction issue // in MAPI when multiple threads perform init/release diff --git a/mozilla/mailnews/addrbook/src/nsMapiAddressBook.cpp b/mozilla/mailnews/addrbook/src/nsMapiAddressBook.cpp index bc6033212c7..10e12350925 100644 --- a/mozilla/mailnews/addrbook/src/nsMapiAddressBook.cpp +++ b/mozilla/mailnews/addrbook/src/nsMapiAddressBook.cpp @@ -139,8 +139,6 @@ void nsMapiAddressBook::FreeMapiLibrary(void) } } -MOZ_DECL_CTOR_COUNTER(nsMapiAddressBook) - nsMapiAddressBook::nsMapiAddressBook(void) : nsAbWinHelper() { diff --git a/mozilla/mailnews/addrbook/src/nsWabAddressBook.cpp b/mozilla/mailnews/addrbook/src/nsWabAddressBook.cpp index b0a0909a116..e4c422af70b 100644 --- a/mozilla/mailnews/addrbook/src/nsWabAddressBook.cpp +++ b/mozilla/mailnews/addrbook/src/nsWabAddressBook.cpp @@ -91,8 +91,6 @@ void nsWabAddressBook::FreeWabLibrary(void) } } -MOZ_DECL_CTOR_COUNTER(nsWabAddressBook) - nsWabAddressBook::nsWabAddressBook(void) : nsAbWinHelper() { diff --git a/mozilla/mailnews/base/src/nsMsgCopyService.cpp b/mozilla/mailnews/base/src/nsMsgCopyService.cpp index e51a955a46c..b24e5542d1b 100644 --- a/mozilla/mailnews/base/src/nsMsgCopyService.cpp +++ b/mozilla/mailnews/base/src/nsMsgCopyService.cpp @@ -44,8 +44,6 @@ // ******************** nsCopySource ****************** // -MOZ_DECL_CTOR_COUNTER(nsCopySource) - nsCopySource::nsCopySource() : m_processed(PR_FALSE) { MOZ_COUNT_CTOR(nsCopySource); @@ -77,8 +75,6 @@ void nsCopySource::AddMessage(nsIMsgDBHdr* aMsg) // ************ nsCopyRequest ***************** // -MOZ_DECL_CTOR_COUNTER(nsCopyRequest) - nsCopyRequest::nsCopyRequest() : m_requestType(nsCopyMessagesType), m_isMoveOrDraftOrTemplate(PR_FALSE), diff --git a/mozilla/mailnews/base/src/nsSubscribableServer.cpp b/mozilla/mailnews/base/src/nsSubscribableServer.cpp index fe99cbe3898..4f5701d3392 100644 --- a/mozilla/mailnews/base/src/nsSubscribableServer.cpp +++ b/mozilla/mailnews/base/src/nsSubscribableServer.cpp @@ -58,8 +58,6 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -MOZ_DECL_CTOR_COUNTER(nsSubscribableServer) - nsSubscribableServer::nsSubscribableServer(void) { mDelimiter = '.'; diff --git a/mozilla/mailnews/base/util/nsMsgGroupRecord.cpp b/mozilla/mailnews/base/util/nsMsgGroupRecord.cpp index 3d490ccec0d..5e6f06be714 100644 --- a/mozilla/mailnews/base/util/nsMsgGroupRecord.cpp +++ b/mozilla/mailnews/base/util/nsMsgGroupRecord.cpp @@ -110,8 +110,6 @@ nsMsgGroupRecord::Create(nsMsgGroupRecord* parent, const char* partname, return result; } -MOZ_DECL_CTOR_COUNTER(nsMsgGroupRecord) - nsMsgGroupRecord::nsMsgGroupRecord(nsMsgGroupRecord* parent, const char* partname, PRInt64 aTime, PRInt32 uniqueid, PRInt32 fileoffset, char delimiter /* = '.' */) diff --git a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp index c24f6bad4ab..a1a76263df6 100644 --- a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp +++ b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp @@ -84,8 +84,6 @@ #define REL_FILE_PREF_SUFFIX NS_LITERAL_CSTRING("-rel") -MOZ_DECL_CTOR_COUNTER(nsMsgIncomingServer) - nsMsgIncomingServer::nsMsgIncomingServer(): m_rootFolder(0), m_prefBranch(0), diff --git a/mozilla/mailnews/base/util/nsMsgKeySet.cpp b/mozilla/mailnews/base/util/nsMsgKeySet.cpp index ef99594dc3d..d6432b16101 100644 --- a/mozilla/mailnews/base/util/nsMsgKeySet.cpp +++ b/mozilla/mailnews/base/util/nsMsgKeySet.cpp @@ -94,9 +94,6 @@ set holds a cache of the last value asked for, and can simply resume the search from there. */ -MOZ_DECL_CTOR_COUNTER(nsMsgKeySet) - - nsMsgKeySet::nsMsgKeySet(/* MSG_NewsHost* host*/) { MOZ_COUNT_CTOR(nsMsgKeySet); diff --git a/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp b/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp index 35ac2db1e43..5dfd0244857 100644 --- a/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp +++ b/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp @@ -42,8 +42,6 @@ #include "nsIInputStream.h" // used by nsMsgLineStreamBuffer -MOZ_DECL_CTOR_COUNTER(nsByteArray) - nsByteArray::nsByteArray() { MOZ_COUNT_CTOR(nsByteArray); @@ -99,8 +97,6 @@ nsresult nsByteArray::AppendBuffer(const char *buffer, PRUint32 length) return ret; } -MOZ_DECL_CTOR_COUNTER(nsMsgLineBuffer) - nsMsgLineBuffer::nsMsgLineBuffer(nsMsgLineBufferHandler *handler, PRBool convertNewlinesP) { MOZ_COUNT_CTOR(nsMsgLineBuffer); diff --git a/mozilla/mailnews/base/util/nsUInt32Array.cpp b/mozilla/mailnews/base/util/nsUInt32Array.cpp index 56596677b43..2f5bba5a641 100644 --- a/mozilla/mailnews/base/util/nsUInt32Array.cpp +++ b/mozilla/mailnews/base/util/nsUInt32Array.cpp @@ -50,8 +50,6 @@ #include "nsUInt32Array.h" #include "nsQuickSort.h" -MOZ_DECL_CTOR_COUNTER(nsUInt32Array) - nsUInt32Array::nsUInt32Array() { MOZ_COUNT_CTOR(nsUInt32Array); diff --git a/mozilla/mailnews/base/util/nsUint8Array.cpp b/mozilla/mailnews/base/util/nsUint8Array.cpp index ceef43b8e32..8f7f601335c 100644 --- a/mozilla/mailnews/base/util/nsUint8Array.cpp +++ b/mozilla/mailnews/base/util/nsUint8Array.cpp @@ -38,8 +38,6 @@ #include "msgCore.h" #include "nsUint8Array.h" -MOZ_DECL_CTOR_COUNTER(nsUint8Array) - nsUint8Array::nsUint8Array() { m_pData = nsnull; diff --git a/mozilla/modules/libjar/nsZipArchive.cpp b/mozilla/modules/libjar/nsZipArchive.cpp index d535f1d877c..c0607482695 100644 --- a/mozilla/modules/libjar/nsZipArchive.cpp +++ b/mozilla/modules/libjar/nsZipArchive.cpp @@ -1895,8 +1895,6 @@ cleanup: // nsZipArchive constructor and destructor //------------------------------------------ -MOZ_DECL_CTOR_COUNTER(nsZipArchive) - nsZipArchive::nsZipArchive() : kMagic(ZIP_MAGIC), kArenaBlockSize(1*1024) #ifdef STANDALONE @@ -1947,14 +1945,10 @@ nsZipItem::~nsZipItem() // nsZipReadState //------------------------------------------ -MOZ_DECL_CTOR_COUNTER(nsZipReadState) - //------------------------------------------ // nsZipFind constructor and destructor //------------------------------------------ -MOZ_DECL_CTOR_COUNTER(nsZipFind) - nsZipFind::nsZipFind(nsZipArchive* aZip, char* aPattern, PRBool aRegExp) : kMagic(ZIPFIND_MAGIC), mArchive(aZip), diff --git a/mozilla/modules/libjar/zipstub.h b/mozilla/modules/libjar/zipstub.h index 78f6add0738..ef1c1422f97 100644 --- a/mozilla/modules/libjar/zipstub.h +++ b/mozilla/modules/libjar/zipstub.h @@ -118,6 +118,5 @@ typedef PRUint8 PRPackedBool; #define NS_WildCardValid(a) NON_SXP #define NS_WildCardMatch(a,b,c) PR_FALSE -#define MOZ_DECL_CTOR_COUNTER(x) #define MOZ_COUNT_CTOR(x) #define MOZ_COUNT_DTOR(x) diff --git a/mozilla/modules/oji/src/nsCSecurityContext.cpp b/mozilla/modules/oji/src/nsCSecurityContext.cpp index 3856f1f9898..aa151599331 100644 --- a/mozilla/modules/oji/src/nsCSecurityContext.cpp +++ b/mozilla/modules/oji/src/nsCSecurityContext.cpp @@ -174,8 +174,6 @@ nsCSecurityContext::GetCertificateID(char* buf, int buflen) // from nsCSecurityContext: extern PRUintn tlsIndex3_g; -MOZ_DECL_CTOR_COUNTER(nsCSecurityContext) - nsCSecurityContext::nsCSecurityContext(JSContext* cx) : m_pJStoJavaFrame(NULL), m_pJSCX(cx), m_pPrincipal(NULL), diff --git a/mozilla/parser/htmlparser/src/CParserContext.cpp b/mozilla/parser/htmlparser/src/CParserContext.cpp index 2a184fea40b..9b83342654a 100644 --- a/mozilla/parser/htmlparser/src/CParserContext.cpp +++ b/mozilla/parser/htmlparser/src/CParserContext.cpp @@ -44,8 +44,6 @@ #include "nsIHTMLContentSink.h" #include "nsHTMLTokenizer.h" -MOZ_DECL_CTOR_COUNTER(CParserContext) - CParserContext::CParserContext(nsScanner* aScanner, void *aKey, eParserCommands aCommand, diff --git a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp index f7106d4c6af..636c3dc8786 100644 --- a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp +++ b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp @@ -47,11 +47,6 @@ #include "nsIServiceManager.h" #include "nsUnicharUtils.h" -MOZ_DECL_CTOR_COUNTER(nsEntryStack) -MOZ_DECL_CTOR_COUNTER(nsDTDContext) -MOZ_DECL_CTOR_COUNTER(nsTokenAllocator) -MOZ_DECL_CTOR_COUNTER(CNodeRecycler) - /************************************************************************************** A few notes about how residual style handling is performed: diff --git a/mozilla/parser/htmlparser/src/nsScanner.cpp b/mozilla/parser/htmlparser/src/nsScanner.cpp index 2d78e16cb38..2391b3e10d8 100644 --- a/mozilla/parser/htmlparser/src/nsScanner.cpp +++ b/mozilla/parser/htmlparser/src/nsScanner.cpp @@ -79,8 +79,6 @@ const int kBufsize=1; const int kBufsize=64; #endif -MOZ_DECL_CTOR_COUNTER(nsScanner) - /** * Use this constructor if you want i/o to be based on * a single string you hand in during construction. diff --git a/mozilla/parser/htmlparser/src/nsToken.cpp b/mozilla/parser/htmlparser/src/nsToken.cpp index 0ee5620f41a..58a430648d6 100644 --- a/mozilla/parser/htmlparser/src/nsToken.cpp +++ b/mozilla/parser/htmlparser/src/nsToken.cpp @@ -38,11 +38,6 @@ #include "nsToken.h" #include "nsScanner.h" - -#ifdef MATCH_CTOR_DTOR -MOZ_DECL_CTOR_COUNTER(CToken) -#endif - static int TokenCount=0; static int DelTokenCount=0; diff --git a/mozilla/rdf/base/src/nsRDFContentSink.cpp b/mozilla/rdf/base/src/nsRDFContentSink.cpp index 6a38237c2a7..ea2df5e8c82 100644 --- a/mozilla/rdf/base/src/nsRDFContentSink.cpp +++ b/mozilla/rdf/base/src/nsRDFContentSink.cpp @@ -134,8 +134,6 @@ enum RDFContentSinkParseMode { eRDFContentSinkParseMode_Date }; -MOZ_DECL_CTOR_COUNTER(RDFContentSinkImpl::NameSpaceEntry) - typedef NS_STDCALL_FUNCPROTO(nsresult, nsContainerTestFn, diff --git a/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp b/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp index d72f6a51470..f5b9decf939 100644 --- a/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp +++ b/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp @@ -176,18 +176,15 @@ done: } NS_IMPL_THREADSAFE_ISUPPORTS1(nsKeygenFormProcessor, nsIFormProcessor) -MOZ_DECL_CTOR_COUNTER(nsKeygenFormProcessor) nsKeygenFormProcessor::nsKeygenFormProcessor() { - MOZ_COUNT_CTOR(nsKeygenFormProcessor); m_ctx = new PipUIContext(); } nsKeygenFormProcessor::~nsKeygenFormProcessor() { - MOZ_COUNT_DTOR(nsKeygenFormProcessor); } NS_METHOD diff --git a/mozilla/view/src/nsView.cpp b/mozilla/view/src/nsView.cpp index 30f6ca41268..b3efa98d794 100644 --- a/mozilla/view/src/nsView.cpp +++ b/mozilla/view/src/nsView.cpp @@ -174,8 +174,6 @@ nsEventStatus PR_CALLBACK HandleEvent(nsGUIEvent *aEvent) return result; } -MOZ_DECL_CTOR_COUNTER(nsView) - nsView::nsView(nsViewManager* aViewManager, nsViewVisibility aVisibility) { MOZ_COUNT_CTOR(nsView); diff --git a/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp b/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp index ef6646b7f1c..65beb80cdf6 100644 --- a/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp +++ b/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp @@ -78,7 +78,6 @@ nsGtkIMEHelper* nsGtkIMEHelper::GetSingleton() } } //----------------------------------------------------------------------- -MOZ_DECL_CTOR_COUNTER(nsGtkIMEHelper) nsGtkIMEHelper::nsGtkIMEHelper() { diff --git a/mozilla/xpcom/ds/nsDeque.cpp b/mozilla/xpcom/ds/nsDeque.cpp index ce08aeaa874..7c1fd7a24f8 100644 --- a/mozilla/xpcom/ds/nsDeque.cpp +++ b/mozilla/xpcom/ds/nsDeque.cpp @@ -73,8 +73,6 @@ #define modasgn(x,y) if (x<0) x+=y; x%=y #define modulus(x,y) ((x<0)?(x+y)%(y):(x)%(y)) -MOZ_DECL_CTOR_COUNTER(nsDeque) - /** * Standard constructor * @param deallocator, called by Erase and ~nsDeque diff --git a/mozilla/xpcom/ds/nsEmptyEnumerator.cpp b/mozilla/xpcom/ds/nsEmptyEnumerator.cpp index 7337dd805da..0ec0f635991 100644 --- a/mozilla/xpcom/ds/nsEmptyEnumerator.cpp +++ b/mozilla/xpcom/ds/nsEmptyEnumerator.cpp @@ -47,8 +47,6 @@ //////////////////////////////////////////////////////////////////////// -MOZ_DECL_CTOR_COUNTER(EmptyEnumeratorImpl) - EmptyEnumeratorImpl::EmptyEnumeratorImpl(void) { MOZ_COUNT_CTOR(EmptyEnumeratorImpl); diff --git a/mozilla/xpcom/ds/nsHashtable.cpp b/mozilla/xpcom/ds/nsHashtable.cpp index ce74fb28f01..e243cde8f5f 100644 --- a/mozilla/xpcom/ds/nsHashtable.cpp +++ b/mozilla/xpcom/ds/nsHashtable.cpp @@ -153,8 +153,6 @@ nsHashKey::Write(nsIObjectOutputStream* aStream) const return NS_ERROR_NOT_IMPLEMENTED; } -MOZ_DECL_CTOR_COUNTER(nsHashtable) - nsHashtable::nsHashtable(PRUint32 aInitSize, PRBool threadSafe) : mLock(NULL), mEnumerating(PR_FALSE) { diff --git a/mozilla/xpcom/io/nsFastLoadFile.cpp b/mozilla/xpcom/io/nsFastLoadFile.cpp index 9cf7a18bcac..9e6593838ce 100644 --- a/mozilla/xpcom/io/nsFastLoadFile.cpp +++ b/mozilla/xpcom/io/nsFastLoadFile.cpp @@ -267,8 +267,6 @@ NS_IMPL_ISUPPORTS_INHERITED5(nsFastLoadFileReader, nsISeekableStream, nsIFastLoadFileReader) -MOZ_DECL_CTOR_COUNTER(nsFastLoadFileReader) - nsresult nsFastLoadFileReader::ReadHeader(nsFastLoadHeader *aHeader) { @@ -1226,8 +1224,6 @@ NS_IMPL_ISUPPORTS_INHERITED4(nsFastLoadFileWriter, nsIFastLoadWriteControl, nsISeekableStream) -MOZ_DECL_CTOR_COUNTER(nsFastLoadFileWriter) - struct nsIDMapEntry : public PLDHashEntryHdr { NSFastLoadID mFastID; // 1 + nsFastLoadFooter::mIDMap index nsID mSlowID; // key, used by PLDHashTableOps below diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiFile.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiFile.cpp index 50362c750be..d60f58ca813 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/xptiFile.cpp +++ b/mozilla/xpcom/reflect/xptinfo/src/xptiFile.cpp @@ -41,8 +41,6 @@ #include "xptiprivate.h" -MOZ_DECL_CTOR_COUNTER(xptiFile) - xptiFile::xptiFile() : #ifdef DEBUG diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiMisc.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiMisc.cpp index 6a729a6157f..6bb0c478cfe 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/xptiMisc.cpp +++ b/mozilla/xpcom/reflect/xptinfo/src/xptiMisc.cpp @@ -71,8 +71,6 @@ xptiFileType::Type xptiFileType::GetType(const char* name) /***************************************************************************/ -MOZ_DECL_CTOR_COUNTER(xptiAutoLog) - xptiAutoLog::xptiAutoLog(xptiInterfaceInfoManager* mgr, nsILocalFile* logfile, PRBool append) : mMgr(nsnull), mOldFileDesc(nsnull) diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp index b9602726784..f23bb1099d9 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp +++ b/mozilla/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp @@ -115,8 +115,6 @@ static const struct PLDHashTableOps NameTableOps = /***************************************************************************/ -MOZ_DECL_CTOR_COUNTER(xptiWorkingSet) - xptiWorkingSet::xptiWorkingSet(nsISupportsArray* aDirectories) : mFileCount(0), mMaxFileCount(0), diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiZipItem.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiZipItem.cpp index c9a6178b258..6d4792f51d2 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/xptiZipItem.cpp +++ b/mozilla/xpcom/reflect/xptinfo/src/xptiZipItem.cpp @@ -41,8 +41,6 @@ #include "xptiprivate.h" -MOZ_DECL_CTOR_COUNTER(xptiZipItem) - xptiZipItem::xptiZipItem() : #ifdef DEBUG diff --git a/mozilla/xpfe/components/intl/nsCharsetMenu.cpp b/mozilla/xpfe/components/intl/nsCharsetMenu.cpp index 042d494e25c..a813c7b6a04 100644 --- a/mozilla/xpfe/components/intl/nsCharsetMenu.cpp +++ b/mozilla/xpfe/components/intl/nsCharsetMenu.cpp @@ -142,8 +142,6 @@ public: nsAutoString mTitle; }; -MOZ_DECL_CTOR_COUNTER(nsMenuEntry) - //---------------------------------------------------------------------------- // Class nsCharsetMenu [declaration] diff --git a/mozilla/xpinstall/src/nsAppleSingleDecoder.cpp b/mozilla/xpinstall/src/nsAppleSingleDecoder.cpp index 54f1c36a1d2..33abbb33972 100644 --- a/mozilla/xpinstall/src/nsAppleSingleDecoder.cpp +++ b/mozilla/xpinstall/src/nsAppleSingleDecoder.cpp @@ -57,9 +57,6 @@ using namespace std; /*----------------------------------------------------------------------* * Constructors/Destructor *----------------------------------------------------------------------*/ -#ifdef MOZILLA_CLIENT - MOZ_DECL_CTOR_COUNTER(nsAppleSingleDecoder) -#endif nsAppleSingleDecoder::nsAppleSingleDecoder(const FSRef *inRef, FSRef *outRef) : mInRef(NULL), diff --git a/mozilla/xpinstall/src/nsInstall.cpp b/mozilla/xpinstall/src/nsInstall.cpp index 9cb8a9ff9a3..32ac1181ef9 100644 --- a/mozilla/xpinstall/src/nsInstall.cpp +++ b/mozilla/xpinstall/src/nsInstall.cpp @@ -165,8 +165,6 @@ NS_SoftwareUpdateRequestAutoReg() -MOZ_DECL_CTOR_COUNTER(nsInstallInfo) - nsInstallInfo::nsInstallInfo(PRUint32 aInstallType, nsIFile* aFile, const PRUnichar* aURL, @@ -231,8 +229,6 @@ nsInstallInfo::~nsInstallInfo() static NS_DEFINE_IID(kSoftwareUpdateCID, NS_SoftwareUpdate_CID); -MOZ_DECL_CTOR_COUNTER(nsInstall) - nsInstall::nsInstall(nsIZipReader * theJARFile) { MOZ_COUNT_CTOR(nsInstall); diff --git a/mozilla/xpinstall/src/nsInstallExecute.cpp b/mozilla/xpinstall/src/nsInstallExecute.cpp index 3510a90fa3f..383cd5a1274 100644 --- a/mozilla/xpinstall/src/nsInstallExecute.cpp +++ b/mozilla/xpinstall/src/nsInstallExecute.cpp @@ -54,8 +54,6 @@ static NS_DEFINE_CID(kIProcessCID, NS_PROCESS_CID); -MOZ_DECL_CTOR_COUNTER(nsInstallExecute) - // Chop the command-line up in place into an array of arguments // by replacing spaces in the command-line string with null // terminators and pointing the array elements to the diff --git a/mozilla/xpinstall/src/nsInstallFile.cpp b/mozilla/xpinstall/src/nsInstallFile.cpp index a38ebcf9139..da9816b04d4 100644 --- a/mozilla/xpinstall/src/nsInstallFile.cpp +++ b/mozilla/xpinstall/src/nsInstallFile.cpp @@ -60,8 +60,6 @@ inFinalFileSpec - final location on disk */ -MOZ_DECL_CTOR_COUNTER(nsInstallFile) - nsInstallFile::nsInstallFile(nsInstall* inInstall, const nsString& inComponentName, const nsString& inVInfo, diff --git a/mozilla/xpinstall/src/nsInstallFileOpItem.cpp b/mozilla/xpinstall/src/nsInstallFileOpItem.cpp index aad17781d00..b543fd1b71f 100644 --- a/mozilla/xpinstall/src/nsInstallFileOpItem.cpp +++ b/mozilla/xpinstall/src/nsInstallFileOpItem.cpp @@ -63,8 +63,6 @@ static NS_DEFINE_CID(kIProcessCID, NS_PROCESS_CID); /* Public Methods */ -MOZ_DECL_CTOR_COUNTER(nsInstallFileOpItem) - nsInstallFileOpItem::nsInstallFileOpItem(nsInstall* aInstallObj, PRInt32 aCommand, nsIFile* aTarget, diff --git a/mozilla/xpinstall/src/nsInstallFolder.cpp b/mozilla/xpinstall/src/nsInstallFolder.cpp index b804bfd9aae..cec3fb39adb 100644 --- a/mozilla/xpinstall/src/nsInstallFolder.cpp +++ b/mozilla/xpinstall/src/nsInstallFolder.cpp @@ -137,8 +137,6 @@ struct DirectoryTable DirectoryTable[] = }; -MOZ_DECL_CTOR_COUNTER(nsInstallFolder) - nsInstallFolder::nsInstallFolder() { MOZ_COUNT_CTOR(nsInstallFolder); diff --git a/mozilla/xpinstall/src/nsInstallLogComment.cpp b/mozilla/xpinstall/src/nsInstallLogComment.cpp index 9c210db5385..06ff37cc2ef 100644 --- a/mozilla/xpinstall/src/nsInstallLogComment.cpp +++ b/mozilla/xpinstall/src/nsInstallLogComment.cpp @@ -51,8 +51,6 @@ #include "nsIDOMInstallVersion.h" #include "nsNativeCharsetUtils.h" -MOZ_DECL_CTOR_COUNTER(nsInstallLogComment) - nsInstallLogComment::nsInstallLogComment( nsInstall* inInstall, const nsAString& inFileOpCommand, const nsAString& inComment, diff --git a/mozilla/xpinstall/src/nsInstallPatch.cpp b/mozilla/xpinstall/src/nsInstallPatch.cpp index 00f7bf95f67..6c76dc34ab6 100644 --- a/mozilla/xpinstall/src/nsInstallPatch.cpp +++ b/mozilla/xpinstall/src/nsInstallPatch.cpp @@ -88,8 +88,6 @@ static int32 gdiff_validateFile( pDIFFDATA dd, int file ); static PRBool su_unbind(char* oldsrc, char* newsrc); #endif -MOZ_DECL_CTOR_COUNTER(nsInstallPatch) - nsInstallPatch::nsInstallPatch( nsInstall* inInstall, const nsString& inVRName, const nsString& inVInfo, diff --git a/mozilla/xpinstall/src/nsInstallUninstall.cpp b/mozilla/xpinstall/src/nsInstallUninstall.cpp index 5e2a71461b0..e84b89504de 100644 --- a/mozilla/xpinstall/src/nsInstallUninstall.cpp +++ b/mozilla/xpinstall/src/nsInstallUninstall.cpp @@ -51,8 +51,6 @@ extern "C" NS_EXPORT PRInt32 SU_Uninstall(char *regPackageName); REGERR su_UninstallProcessItem(char *component_path); -MOZ_DECL_CTOR_COUNTER(nsInstallUninstall) - nsInstallUninstall::nsInstallUninstall( nsInstall* inInstall, const nsString& regName, PRInt32 *error) diff --git a/mozilla/xpinstall/src/nsRegisterItem.cpp b/mozilla/xpinstall/src/nsRegisterItem.cpp index e27986c8883..aa1a1be38f7 100644 --- a/mozilla/xpinstall/src/nsRegisterItem.cpp +++ b/mozilla/xpinstall/src/nsRegisterItem.cpp @@ -51,8 +51,6 @@ #include "nsAppDirectoryServiceDefs.h" #include "nsNativeCharsetUtils.h" -MOZ_DECL_CTOR_COUNTER(nsRegisterItem) - nsRegisterItem:: nsRegisterItem( nsInstall* inInstall, nsIFile* chrome, PRUint32 chromeType, diff --git a/mozilla/xpinstall/src/nsWinProfile.cpp b/mozilla/xpinstall/src/nsWinProfile.cpp index b5132a5c093..bf36098d972 100644 --- a/mozilla/xpinstall/src/nsWinProfile.cpp +++ b/mozilla/xpinstall/src/nsWinProfile.cpp @@ -44,8 +44,6 @@ /* Public Methods */ -MOZ_DECL_CTOR_COUNTER(nsWinProfile) - nsWinProfile::nsWinProfile( nsInstall* suObj, const nsString& folder, const nsString& file ) : mFilename(folder) { diff --git a/mozilla/xpinstall/src/nsWinProfileItem.cpp b/mozilla/xpinstall/src/nsWinProfileItem.cpp index 911dd1b2a88..2cf1cae2074 100644 --- a/mozilla/xpinstall/src/nsWinProfileItem.cpp +++ b/mozilla/xpinstall/src/nsWinProfileItem.cpp @@ -42,8 +42,6 @@ /* Public Methods */ -MOZ_DECL_CTOR_COUNTER(nsWinProfileItem) - nsWinProfileItem::nsWinProfileItem(nsWinProfile* profileObj, nsString sectionName, nsString keyName, diff --git a/mozilla/xpinstall/src/nsWinReg.cpp b/mozilla/xpinstall/src/nsWinReg.cpp index d634f24a907..9de2ad24615 100644 --- a/mozilla/xpinstall/src/nsWinReg.cpp +++ b/mozilla/xpinstall/src/nsWinReg.cpp @@ -43,8 +43,6 @@ /* Public Methods */ -MOZ_DECL_CTOR_COUNTER(nsWinReg) - nsWinReg::nsWinReg(nsInstall* suObj) { MOZ_COUNT_CTOR(nsWinReg); diff --git a/mozilla/xpinstall/src/nsWinRegItem.cpp b/mozilla/xpinstall/src/nsWinRegItem.cpp index f554d6b0713..f1aa6de2792 100644 --- a/mozilla/xpinstall/src/nsWinRegItem.cpp +++ b/mozilla/xpinstall/src/nsWinRegItem.cpp @@ -45,8 +45,6 @@ /* Public Methods */ -MOZ_DECL_CTOR_COUNTER(nsWinRegItem) - nsWinRegItem::nsWinRegItem(nsWinReg* regObj, PRInt32 root, PRInt32 action, const nsAString& sub, const nsAString& valname, const nsAString& val, PRInt32 *aReturn) : nsInstallObject(regObj->InstallObject()) { diff --git a/mozilla/xpinstall/src/nsXPITriggerInfo.cpp b/mozilla/xpinstall/src/nsXPITriggerInfo.cpp index 27db9b42651..3d0799a4733 100644 --- a/mozilla/xpinstall/src/nsXPITriggerInfo.cpp +++ b/mozilla/xpinstall/src/nsXPITriggerInfo.cpp @@ -53,7 +53,6 @@ static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); // // nsXPITriggerItem // -MOZ_DECL_CTOR_COUNTER(nsXPITriggerItem) nsXPITriggerItem::nsXPITriggerItem( const PRUnichar* aName, const PRUnichar* aURL, @@ -177,8 +176,6 @@ nsXPITriggerItem::SetPrincipal(nsIPrincipal* aPrincipal) // nsXPITriggerInfo // -MOZ_DECL_CTOR_COUNTER(nsXPITriggerInfo) - nsXPITriggerInfo::nsXPITriggerInfo() : mCx(0), mCbval(JSVAL_NULL) {