From 2e26d974146302c46d790cf8c0926556dc4e08a6 Mon Sep 17 00:00:00 2001 From: "dcamp%mozilla.com" Date: Fri, 31 Aug 2007 23:29:45 +0000 Subject: [PATCH] fix bustage from bug 384941 git-svn-id: svn://10.0.0.236/trunk@233524 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 68536f5fe15..22232ed96e4 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -9136,10 +9136,11 @@ nsClassifierCallback::Run() rv = channel->Suspend(); NS_ENSURE_SUCCESS(rv, rv); mSuspendedChannel = channel; - +#if defined(PR_LOGGING) && defined(DEBUG) PR_LOG(gDocShellLog, PR_LOG_DEBUG, ("nsClassifierCallback[%p]: suspended channel %p", this, mSuspendedChannel.get())); +#endif } return NS_OK; @@ -9150,14 +9151,18 @@ nsClassifierCallback::OnClassifyComplete(nsresult aErrorCode) { if (mSuspendedChannel) { if (NS_FAILED(aErrorCode)) { +#if defined(PR_LOGGING) && defined(DEBUG) PR_LOG(gDocShellLog, PR_LOG_DEBUG, ("nsClassifierCallback[%p]: cancelling channel %p with error code: %d", this, mSuspendedChannel.get(), aErrorCode)); mSuspendedChannel->Cancel(aErrorCode); +#endif } +#if defined(PR_LOGGING) && defined(DEBUG) PR_LOG(gDocShellLog, PR_LOG_DEBUG, ("nsClassifierCallback[%p]: resuming channel %p from OnClassifyComplete", this, mSuspendedChannel.get())); +#endif mSuspendedChannel->Resume(); mSuspendedChannel = nsnull; } @@ -9169,9 +9174,11 @@ void nsClassifierCallback::Cancel() { if (mSuspendedChannel) { +#if defined(PR_LOGGING) && defined(DEBUG) PR_LOG(gDocShellLog, PR_LOG_DEBUG, ("nsClassifierCallback[%p]: resuming channel %p from Cancel()", this, mSuspendedChannel.get())); +#endif mSuspendedChannel->Resume(); mSuspendedChannel = nsnull; }