From d726ac51c333bce9a0d78c2b99e93ed65e12efca Mon Sep 17 00:00:00 2001
From: "valeski%netscape.com"
 <valeski%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 11 Sep 2000 22:06:52 +0000
Subject: [PATCH] 50188. removing webshell leak detection special macros. now
 we'll spew data in debug builds only

git-svn-id: svn://10.0.0.236/trunk@78777 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/config/config.mak                   |  6 -----
 mozilla/config/mac/DefinesMozilla.h         |  2 --
 mozilla/docshell/base/nsWebShell.cpp        | 26 +++++----------------
 mozilla/docshell/base/nsWebShell.h          |  4 ++--
 mozilla/webshell/src/dlldeps.cpp            |  3 ---
 mozilla/webshell/tests/viewer/nsMacMain.cpp |  4 ----
 6 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/mozilla/config/config.mak b/mozilla/config/config.mak
index 86ef378b14c..e4f3dcdacc8 100644
--- a/mozilla/config/config.mak
+++ b/mozilla/config/config.mak
@@ -209,12 +209,6 @@ CFLAGS=$(CFLAGS) -DXPCOM_STANDALONE
 CFLAGS=$(CFLAGS) -DXPCONNECT_STANDALONE
 !endif
 
-# XXX We need to remove this before we ship.
-# This causes a static linkage between the webshell
-# and xpfe.f
-DETECT_WEBSHELL_LEAKS=1
-CFLAGS=$(CFLAGS) -DDETECT_WEBSHELL_LEAKS
-
 # Enable output of performance metrics if MOZ_PERF is set
 !ifdef MOZ_PERF
 CFLAGS=$(CFLAGS) -DMOZ_PERF_METRICS
diff --git a/mozilla/config/mac/DefinesMozilla.h b/mozilla/config/mac/DefinesMozilla.h
index 337d90e5506..648e258032d 100644
--- a/mozilla/config/mac/DefinesMozilla.h
+++ b/mozilla/config/mac/DefinesMozilla.h
@@ -94,8 +94,6 @@
 
 #define NECKO 1
 
-#define DETECT_WEBSHELL_LEAKS 1
-
 //#define MOZ_PERF_METRICS 1		// Uncomment to get metrics in layout, parser and webshell.
 															// You also need to define __TIMESIZE_DOUBLE__ in <timesize.mac.h>
 
diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index 9855ead62b3..020e55256b6 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -30,20 +30,6 @@
 typedef unsigned long HMTX;
 #endif
 
-#ifdef DEBUG
-#undef NOISY_LINKS
-#undef NOISY_WEBSHELL_LEAKS
-#else
-#undef NOISY_LINKS
-#undef NOISY_WEBSHELL_LEAKS
-#endif
-
-#define NOISY_WEBSHELL_LEAKS
-#ifdef NOISY_WEBSHELL_LEAKS
-#undef DETECT_WEBSHELL_LEAKS
-#define DETECT_WEBSHELL_LEAKS
-#endif
-
 #include "nsDocShell.h"
 #include "nsIWebShell.h"
 #include "nsWebShell.h"
@@ -196,12 +182,12 @@ static NS_DEFINE_IID(kILinkHandlerIID,        NS_ILINKHANDLER_IID);
 // Note: operator new zeros our memory
 nsWebShell::nsWebShell() : nsDocShell()
 {
-#ifdef DETECT_WEBSHELL_LEAKS
+#ifdef DEBUG
   // We're counting the number of |nsWebShells| to help find leaks
   ++gNumberOfWebShells;
 #endif
-#ifdef NOISY_WEBSHELL_LEAKS
-  printf("WEBSHELL+ = %ld\n", gNumberOfWebShells);
+#ifdef DEBUG
+    printf("WEBSHELL+ = %ld\n", gNumberOfWebShells);
 #endif
 
   NS_INIT_REFCNT();
@@ -248,11 +234,11 @@ nsWebShell::~nsWebShell()
 
   InitFrameData();
 
-#ifdef DETECT_WEBSHELL_LEAKS
+#ifdef DEBUG
   // We're counting the number of |nsWebShells| to help find leaks
   --gNumberOfWebShells;
 #endif
-#ifdef NOISY_WEBSHELL_LEAKS
+#ifdef DEBUG
   printf("WEBSHELL- = %ld\n", gNumberOfWebShells);
 #endif
 }
@@ -1455,6 +1441,6 @@ NS_IMETHODIMP nsWebShell::GetPositionAndSize(PRInt32* x, PRInt32* y,
    return NS_OK; 
 }
 
-#ifdef DETECT_WEBSHELL_LEAKS
+#ifdef DEBUG
 unsigned long nsWebShell::gNumberOfWebShells = 0;
 #endif
diff --git a/mozilla/docshell/base/nsWebShell.h b/mozilla/docshell/base/nsWebShell.h
index 961ec7fb83f..45ccd79f6ab 100644
--- a/mozilla/docshell/base/nsWebShell.h
+++ b/mozilla/docshell/base/nsWebShell.h
@@ -143,11 +143,11 @@ protected:
                         const char* aCommand,
                         nsIStreamListener** aResult);
 
-#ifdef DETECT_WEBSHELL_LEAKS
+#ifdef DEBUG
 private:
   // We're counting the number of |nsWebShells| to help find leaks
   static unsigned long gNumberOfWebShells;
-#endif /* DETECT_WEBSHELL_LEAKS */
+#endif /* DEBUG */
 };
 
 #endif /* webshell____h */
diff --git a/mozilla/webshell/src/dlldeps.cpp b/mozilla/webshell/src/dlldeps.cpp
index 1577402929c..506e7d23da8 100644
--- a/mozilla/webshell/src/dlldeps.cpp
+++ b/mozilla/webshell/src/dlldeps.cpp
@@ -25,7 +25,4 @@
 void
 XXXNeverCalled()
 	{
-#ifdef DETECT_WEBSHELL_LEAKS
-		NS_TotalWebShellsInExistence();
-#endif
 	}
diff --git a/mozilla/webshell/tests/viewer/nsMacMain.cpp b/mozilla/webshell/tests/viewer/nsMacMain.cpp
index 71e9ff34d27..f94b670f6a3 100644
--- a/mozilla/webshell/tests/viewer/nsMacMain.cpp
+++ b/mozilla/webshell/tests/viewer/nsMacMain.cpp
@@ -451,10 +451,6 @@ int main(int argc, char **argv)
 		NS_RELEASE(gTheApp);
 	}
 
-#ifdef RHAPSODY
-#undef DETECT_WEBSHELL_LEAKS
-#endif
-
 	// Shutdown XPCOM?
 	rv = NS_ShutdownXPCOM(nsnull);
 	NS_ASSERTION(NS_SUCCEEDED(rv), "NS_ShutdownXPCOM failed");