From 88967dd6f9b951fd22929797847350c7e2f62b1f Mon Sep 17 00:00:00 2001
From: "dbaron%fas.harvard.edu"
 <dbaron%fas.harvard.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 23 Jun 2000 21:57:39 +0000
Subject: [PATCH] Add new style classes to the leak/bloat logs.  This should
 increase the bloat statistics.  r=attinasi

git-svn-id: svn://10.0.0.236/trunk@73097 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/src/nsStyleContext.cpp |  8 ++++++--
 mozilla/content/base/src/nsStyleSet.cpp     | 13 ++++++++++---
 mozilla/layout/base/src/nsStyleContext.cpp  |  8 ++++++--
 mozilla/layout/base/src/nsStyleSet.cpp      | 13 ++++++++++---
 mozilla/layout/style/nsStyleContext.cpp     |  8 ++++++--
 mozilla/layout/style/nsStyleSet.cpp         | 13 ++++++++++---
 6 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/mozilla/content/base/src/nsStyleContext.cpp b/mozilla/content/base/src/nsStyleContext.cpp
index 879d93d23bd..f88d4dd839f 100644
--- a/mozilla/content/base/src/nsStyleContext.cpp
+++ b/mozilla/content/base/src/nsStyleContext.cpp
@@ -2033,7 +2033,9 @@ inline
 #endif
 PRUint32 nsStyleContextData::AddRef(void)
 {
-  return ++mRefCnt;
+  ++mRefCnt;
+  NS_LOG_ADDREF(this,mRefCnt,"nsStyleContextData",sizeof(*this));
+  return mRefCnt;
 }
 
 #ifndef DEBUG
@@ -2042,7 +2044,9 @@ inline
 PRUint32 nsStyleContextData::Release(void)
 {
   NS_ASSERTION(mRefCnt > 0, "RefCount error in nsStyleContextData");
-  if (0 == --mRefCnt) {
+  --mRefCnt;
+  NS_LOG_RELEASE(this,mRefCnt,"nsStyleContextData");
+  if (0 == mRefCnt) {
 #ifdef NOISY_DEBUG
     printf("deleting nsStyleContextData instance: (%ld)\n", (long)(--gInstanceCount));
 #endif
diff --git a/mozilla/content/base/src/nsStyleSet.cpp b/mozilla/content/base/src/nsStyleSet.cpp
index 9c2eb0137f4..5d275f948ce 100644
--- a/mozilla/content/base/src/nsStyleSet.cpp
+++ b/mozilla/content/base/src/nsStyleSet.cpp
@@ -1384,13 +1384,20 @@ StyleSetImpl::PrintTimer(PRUint32 aTimerID)
 // many items sharing the same ID, and that there are many unique IDs, so
 // this is a comprimise between a sorted-list based lookup and a hash-type 
 // lookup which is not possible due to non-guaranteed-unique keys.
-//
+
+MOZ_DECL_CTOR_COUNTER(StyleContextCache);
+
 StyleContextCache::StyleContextCache(void)
 :mCount(0)
-{ }
+{
+  MOZ_COUNT_CTOR(StyleContextCache);
+}
 
 StyleContextCache:: ~StyleContextCache(void)
-{ mHashTable.Reset(); }
+{
+  mHashTable.Reset();
+  MOZ_COUNT_DTOR(StyleContextCache);
+}
 
 PRUint32 StyleContextCache::Count(void)
 { 
diff --git a/mozilla/layout/base/src/nsStyleContext.cpp b/mozilla/layout/base/src/nsStyleContext.cpp
index 879d93d23bd..f88d4dd839f 100644
--- a/mozilla/layout/base/src/nsStyleContext.cpp
+++ b/mozilla/layout/base/src/nsStyleContext.cpp
@@ -2033,7 +2033,9 @@ inline
 #endif
 PRUint32 nsStyleContextData::AddRef(void)
 {
-  return ++mRefCnt;
+  ++mRefCnt;
+  NS_LOG_ADDREF(this,mRefCnt,"nsStyleContextData",sizeof(*this));
+  return mRefCnt;
 }
 
 #ifndef DEBUG
@@ -2042,7 +2044,9 @@ inline
 PRUint32 nsStyleContextData::Release(void)
 {
   NS_ASSERTION(mRefCnt > 0, "RefCount error in nsStyleContextData");
-  if (0 == --mRefCnt) {
+  --mRefCnt;
+  NS_LOG_RELEASE(this,mRefCnt,"nsStyleContextData");
+  if (0 == mRefCnt) {
 #ifdef NOISY_DEBUG
     printf("deleting nsStyleContextData instance: (%ld)\n", (long)(--gInstanceCount));
 #endif
diff --git a/mozilla/layout/base/src/nsStyleSet.cpp b/mozilla/layout/base/src/nsStyleSet.cpp
index 9c2eb0137f4..5d275f948ce 100644
--- a/mozilla/layout/base/src/nsStyleSet.cpp
+++ b/mozilla/layout/base/src/nsStyleSet.cpp
@@ -1384,13 +1384,20 @@ StyleSetImpl::PrintTimer(PRUint32 aTimerID)
 // many items sharing the same ID, and that there are many unique IDs, so
 // this is a comprimise between a sorted-list based lookup and a hash-type 
 // lookup which is not possible due to non-guaranteed-unique keys.
-//
+
+MOZ_DECL_CTOR_COUNTER(StyleContextCache);
+
 StyleContextCache::StyleContextCache(void)
 :mCount(0)
-{ }
+{
+  MOZ_COUNT_CTOR(StyleContextCache);
+}
 
 StyleContextCache:: ~StyleContextCache(void)
-{ mHashTable.Reset(); }
+{
+  mHashTable.Reset();
+  MOZ_COUNT_DTOR(StyleContextCache);
+}
 
 PRUint32 StyleContextCache::Count(void)
 { 
diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp
index 879d93d23bd..f88d4dd839f 100644
--- a/mozilla/layout/style/nsStyleContext.cpp
+++ b/mozilla/layout/style/nsStyleContext.cpp
@@ -2033,7 +2033,9 @@ inline
 #endif
 PRUint32 nsStyleContextData::AddRef(void)
 {
-  return ++mRefCnt;
+  ++mRefCnt;
+  NS_LOG_ADDREF(this,mRefCnt,"nsStyleContextData",sizeof(*this));
+  return mRefCnt;
 }
 
 #ifndef DEBUG
@@ -2042,7 +2044,9 @@ inline
 PRUint32 nsStyleContextData::Release(void)
 {
   NS_ASSERTION(mRefCnt > 0, "RefCount error in nsStyleContextData");
-  if (0 == --mRefCnt) {
+  --mRefCnt;
+  NS_LOG_RELEASE(this,mRefCnt,"nsStyleContextData");
+  if (0 == mRefCnt) {
 #ifdef NOISY_DEBUG
     printf("deleting nsStyleContextData instance: (%ld)\n", (long)(--gInstanceCount));
 #endif
diff --git a/mozilla/layout/style/nsStyleSet.cpp b/mozilla/layout/style/nsStyleSet.cpp
index 9c2eb0137f4..5d275f948ce 100644
--- a/mozilla/layout/style/nsStyleSet.cpp
+++ b/mozilla/layout/style/nsStyleSet.cpp
@@ -1384,13 +1384,20 @@ StyleSetImpl::PrintTimer(PRUint32 aTimerID)
 // many items sharing the same ID, and that there are many unique IDs, so
 // this is a comprimise between a sorted-list based lookup and a hash-type 
 // lookup which is not possible due to non-guaranteed-unique keys.
-//
+
+MOZ_DECL_CTOR_COUNTER(StyleContextCache);
+
 StyleContextCache::StyleContextCache(void)
 :mCount(0)
-{ }
+{
+  MOZ_COUNT_CTOR(StyleContextCache);
+}
 
 StyleContextCache:: ~StyleContextCache(void)
-{ mHashTable.Reset(); }
+{
+  mHashTable.Reset();
+  MOZ_COUNT_DTOR(StyleContextCache);
+}
 
 PRUint32 StyleContextCache::Count(void)
 {