From 709fd651fec0f9f4a5f8d6825f95bc5887fd903f Mon Sep 17 00:00:00 2001
From: Arpad Borsos <arpad.borsos@googlemail.com>
Date: Sun, 7 Sep 2008 00:04:10 +0200
Subject: [PATCH] Bug 443058 - Remove MOZ_DECL_CTOR_COUNTER; <mozilla-central>
 part; r=benjamin

---
 js/src/xpconnect/src/xpcthreadcontext.cpp | 2 --
 layout/base/nsDisplayList.h               | 1 -
 layout/generic/nsFrame.cpp                | 6 ------
 xpcom/glue/nsTraceRefcnt.h                | 3 ---
 4 files changed, 12 deletions(-)

diff --git a/js/src/xpconnect/src/xpcthreadcontext.cpp b/js/src/xpconnect/src/xpcthreadcontext.cpp
index 3db49ad43000..b229397b50c1 100644
--- a/js/src/xpconnect/src/xpcthreadcontext.cpp
+++ b/js/src/xpconnect/src/xpcthreadcontext.cpp
@@ -460,8 +460,6 @@ GetThreadStackLimit()
   return stackLimit;
 }
 
-MOZ_DECL_CTOR_COUNTER(xpcPerThreadData)
-
 XPCPerThreadData::XPCPerThreadData()
     :   mJSContextStack(new XPCJSContextStack()),
         mNextThread(nsnull),
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index 9c58a4750c15..0546e7be8727 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -957,7 +957,6 @@ protected:
 
 #endif // MOZ_REFLOW_PERF_DSP && MOZ_REFLOW_PERF
 
-MOZ_DECL_CTOR_COUNTER(nsDisplayCaret)
 class nsDisplayCaret : public nsDisplayItem {
 public:
   nsDisplayCaret(nsIFrame* aCaretFrame, nsCaret *aCaret)
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 440a070eb2c6..da5dcea5b220 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -6609,8 +6609,6 @@ DR_cookie::~DR_cookie()
   nsFrame::DisplayReflowExit(mPresContext, mFrame, mMetrics, mStatus, mValue);
 }
 
-MOZ_DECL_CTOR_COUNTER(DR_layout_cookie)
-
 DR_layout_cookie::DR_layout_cookie(nsIFrame* aFrame)
   : mFrame(aFrame)
 {
@@ -6624,8 +6622,6 @@ DR_layout_cookie::~DR_layout_cookie()
   nsFrame::DisplayLayoutExit(mFrame, mValue);
 }
 
-MOZ_DECL_CTOR_COUNTER(DR_intrinsic_width_cookie)
-
 DR_intrinsic_width_cookie::DR_intrinsic_width_cookie(
                      nsIFrame*                aFrame, 
                      const char*              aType,
@@ -6644,8 +6640,6 @@ DR_intrinsic_width_cookie::~DR_intrinsic_width_cookie()
   nsFrame::DisplayIntrinsicWidthExit(mFrame, mType, mResult, mValue);
 }
 
-MOZ_DECL_CTOR_COUNTER(DR_intrinsic_size_cookie)
-
 DR_intrinsic_size_cookie::DR_intrinsic_size_cookie(
                      nsIFrame*                aFrame, 
                      const char*              aType,
diff --git a/xpcom/glue/nsTraceRefcnt.h b/xpcom/glue/nsTraceRefcnt.h
index 9d37e9c8900f..68ce6b2ae28e 100644
--- a/xpcom/glue/nsTraceRefcnt.h
+++ b/xpcom/glue/nsTraceRefcnt.h
@@ -64,8 +64,6 @@
 #define NS_LOG_RELEASE(_p, _rc, _type) \
   NS_LogRelease((_p), (_rc), (_type))
 
-#define MOZ_DECL_CTOR_COUNTER(_type)
-
 #define MOZ_COUNT_CTOR(_type)                                 \
 PR_BEGIN_MACRO                                                \
   NS_LogCtor((void*)this, #_type, sizeof(*this));             \
@@ -91,7 +89,6 @@ PR_END_MACRO
 
 #define NS_LOG_ADDREF(_p, _rc, _type, _size)
 #define NS_LOG_RELEASE(_p, _rc, _type)
-#define MOZ_DECL_CTOR_COUNTER(_type)
 #define MOZ_COUNT_CTOR(_type)
 #define MOZ_COUNT_DTOR(_type)