From 232d8998934b7d79c9d25665e1c7cbdbea950c6e Mon Sep 17 00:00:00 2001 From: "attinasi%netscape.com" Date: Sat, 29 Apr 2000 00:07:40 +0000 Subject: [PATCH] Removed the rest of the PERF_METRICS stuff that was removed when the WebShell changes were landed (the code is now in the Viewer itself). git-svn-id: svn://10.0.0.236/trunk@67592 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 11 +---------- mozilla/webshell/src/nsWebShell.cpp | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index e7400b1e255..0d75c3e9fa9 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -83,7 +83,6 @@ typedef unsigned long HMTX; #include "nsIDOMRange.h" #include "nsIURIContentListener.h" #include "nsIDOMDocument.h" -#include "nsTimer.h" #include "nsIBaseWindow.h" #include "nsIDocShell.h" #include "nsIDocShellTreeItem.h" @@ -319,8 +318,6 @@ protected: const char* aCommand, nsIStreamListener** aResult); - MOZ_TIMER_DECLARE(mTotalTime) - #ifdef DETECT_WEBSHELL_LEAKS private: // We're counting the number of |nsWebShells| to help find leaks @@ -1132,13 +1129,6 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, if(loader != mDocLoader) return NS_OK; -#ifdef MOZ_PERF_METRICS - MOZ_TIMER_DEBUGLOG(("Stop: nsWebShell::OnEndDocumentLoad(), this=%p\n", this)); - MOZ_TIMER_STOP(mTotalTime); - MOZ_TIMER_LOG(("Total (Layout + Page Load) Time (webshell=%p): ", this)); - MOZ_TIMER_PRINT(mTotalTime); -#endif - nsresult rv = NS_ERROR_FAILURE; if(!channel) return NS_ERROR_NULL_POINTER; @@ -1367,6 +1357,7 @@ nsWebShell::OnStartURLLoad(nsIDocumentLoader* loader, { mDocLoaderObserver->OnStartURLLoad(mDocLoader, channel); } + return NS_OK; } diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index e7400b1e255..0d75c3e9fa9 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -83,7 +83,6 @@ typedef unsigned long HMTX; #include "nsIDOMRange.h" #include "nsIURIContentListener.h" #include "nsIDOMDocument.h" -#include "nsTimer.h" #include "nsIBaseWindow.h" #include "nsIDocShell.h" #include "nsIDocShellTreeItem.h" @@ -319,8 +318,6 @@ protected: const char* aCommand, nsIStreamListener** aResult); - MOZ_TIMER_DECLARE(mTotalTime) - #ifdef DETECT_WEBSHELL_LEAKS private: // We're counting the number of |nsWebShells| to help find leaks @@ -1132,13 +1129,6 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, if(loader != mDocLoader) return NS_OK; -#ifdef MOZ_PERF_METRICS - MOZ_TIMER_DEBUGLOG(("Stop: nsWebShell::OnEndDocumentLoad(), this=%p\n", this)); - MOZ_TIMER_STOP(mTotalTime); - MOZ_TIMER_LOG(("Total (Layout + Page Load) Time (webshell=%p): ", this)); - MOZ_TIMER_PRINT(mTotalTime); -#endif - nsresult rv = NS_ERROR_FAILURE; if(!channel) return NS_ERROR_NULL_POINTER; @@ -1367,6 +1357,7 @@ nsWebShell::OnStartURLLoad(nsIDocumentLoader* loader, { mDocLoaderObserver->OnStartURLLoad(mDocLoader, channel); } + return NS_OK; }