Backed out changeset 48ba597444e8 (bug 934091) for linux build bustage on a CLOSED TREE

This commit is contained in:
Carsten "Tomcat" Book 2013-11-06 08:40:37 +01:00
parent 7877d181c0
commit 7901827956
2 changed files with 11 additions and 33 deletions

View File

@ -194,11 +194,6 @@ static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
#define DEBUG_PAGE_CACHE
#endif
#ifdef XP_WIN
#include <process.h>
#define getpid _getpid
#endif
using namespace mozilla;
using namespace mozilla::dom;
@ -800,11 +795,8 @@ nsDocShell::nsDocShell():
// We're counting the number of |nsDocShells| to help find leaks
++gNumberOfDocShells;
if (!PR_GetEnv("MOZ_QUIET")) {
printf_stderr("++DOCSHELL %p == %ld [pid = %d] [id = %llu]\n",
(void*) this,
gNumberOfDocShells,
getpid(),
SafeCast<unsigned long long>(mHistoryID));
printf("++DOCSHELL %p == %ld [id = %llu]\n", (void*) this,
gNumberOfDocShells, SafeCast<unsigned long long>(mHistoryID));
}
#endif
}
@ -832,11 +824,8 @@ nsDocShell::~nsDocShell()
// We're counting the number of |nsDocShells| to help find leaks
--gNumberOfDocShells;
if (!PR_GetEnv("MOZ_QUIET")) {
printf_stderr("--DOCSHELL %p == %ld [pid = %d] [id = %llu]\n",
(void*) this,
gNumberOfDocShells,
getpid(),
SafeCast<unsigned long long>(mHistoryID));
printf("--DOCSHELL %p == %ld [id = %llu]\n", (void*) this,
gNumberOfDocShells, SafeCast<unsigned long long>(mHistoryID));
}
#endif
}

View File

@ -237,11 +237,6 @@ class nsIScriptTimeoutHandler;
static PRLogModuleInfo* gDOMLeakPRLog;
#endif
#ifdef XP_WIN
#include <process.h>
#define getpid _getpid
#endif
static const char kStorageEnabled[] = "dom.storage.enabled";
using namespace mozilla;
@ -1126,12 +1121,10 @@ nsGlobalWindow::nsGlobalWindow(nsGlobalWindow *aOuterWindow)
#ifdef DEBUG
if (!PR_GetEnv("MOZ_QUIET")) {
printf_stderr("++DOMWINDOW == %d (%p) [pid = %d] [serial = %d] [outer = %p]\n",
gRefCnt,
static_cast<void*>(static_cast<nsIScriptGlobalObject*>(this)),
getpid(),
gSerialCounter,
static_cast<void*>(static_cast<nsIScriptGlobalObject*>(aOuterWindow)));
printf("++DOMWINDOW == %d (%p) [serial = %d] [outer = %p]\n", gRefCnt,
static_cast<void*>(static_cast<nsIScriptGlobalObject*>(this)),
gSerialCounter,
static_cast<void*>(static_cast<nsIScriptGlobalObject*>(aOuterWindow)));
}
#endif
@ -1204,13 +1197,9 @@ nsGlobalWindow::~nsGlobalWindow()
}
nsGlobalWindow* outer = static_cast<nsGlobalWindow*>(mOuterWindow.get());
printf_stderr("--DOMWINDOW == %d (%p) [pid = %d] [serial = %d] [outer = %p] [url = %s]\n",
gRefCnt,
static_cast<void*>(static_cast<nsIScriptGlobalObject*>(this)),
getpid(),
mSerial,
static_cast<void*>(static_cast<nsIScriptGlobalObject*>(outer)),
url.get());
printf("--DOMWINDOW == %d (%p) [serial = %d] [outer = %p] [url = %s]\n",
gRefCnt, static_cast<void*>(static_cast<nsIScriptGlobalObject*>(this)),
mSerial, static_cast<void*>(static_cast<nsIScriptGlobalObject*>(outer)), url.get());
}
#endif