From b7fab4e31c87f0f9b787b089602e371bbb4af677 Mon Sep 17 00:00:00 2001 From: "nisheeth%netscape.com" Date: Tue, 19 Oct 1999 22:27:20 +0000 Subject: [PATCH] Changes should not affect the build. Renaming the RAPTOR_PERF_METRICS ifdef to MOZ_PERF_METRICS. git-svn-id: svn://10.0.0.236/trunk@51196 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsStyleSet.cpp | 12 ++++++------ .../content/html/document/src/nsHTMLContentSink.cpp | 4 ++-- mozilla/docshell/base/nsWebShell.cpp | 6 +++--- mozilla/htmlparser/src/CNavDTD.cpp | 2 +- mozilla/htmlparser/src/makefile.win | 4 ---- mozilla/htmlparser/src/nsParser.cpp | 6 +++--- mozilla/htmlparser/src/nsParser.h | 2 +- mozilla/layout/base/nsPresShell.cpp | 8 ++++---- mozilla/layout/base/src/makefile.win | 4 ---- mozilla/layout/base/src/nsStyleSet.cpp | 12 ++++++------ mozilla/layout/html/base/src/makefile.win | 3 --- mozilla/layout/html/base/src/nsPresShell.cpp | 8 ++++---- mozilla/layout/html/document/src/makefile.win | 3 --- .../layout/html/document/src/nsHTMLContentSink.cpp | 4 ++-- mozilla/layout/style/nsStyleSet.cpp | 12 ++++++------ mozilla/modules/libutil/public/stopwatch.h | 4 ++-- mozilla/modules/libutil/src/makefile.win | 7 ------- mozilla/parser/htmlparser/src/CNavDTD.cpp | 2 +- mozilla/parser/htmlparser/src/makefile.win | 4 ---- mozilla/parser/htmlparser/src/nsParser.cpp | 6 +++--- mozilla/parser/htmlparser/src/nsParser.h | 2 +- mozilla/webshell/src/makefile.win | 3 --- mozilla/webshell/src/nsWebShell.cpp | 6 +++--- 23 files changed, 48 insertions(+), 76 deletions(-) diff --git a/mozilla/content/base/src/nsStyleSet.cpp b/mozilla/content/base/src/nsStyleSet.cpp index 865266a09bc..690163ffd03 100644 --- a/mozilla/content/base/src/nsStyleSet.cpp +++ b/mozilla/content/base/src/nsStyleSet.cpp @@ -31,7 +31,7 @@ #include "nsIStyleFrameConstruction.h" #include "nsLayoutAtoms.h" #include "stopwatch.h" -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS #include "nsITimeRecorder.h" #endif @@ -40,7 +40,7 @@ static NS_DEFINE_IID(kIStyleFrameConstructionIID, NS_ISTYLE_FRAME_CONSTRUCTION_I class StyleSetImpl : public nsIStyleSet -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS , public nsITimeRecorder #endif { @@ -164,7 +164,7 @@ public: virtual void List(FILE* out = stdout, PRInt32 aIndent = 0); -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS NS_DECL_NSITIMERECORDER #endif @@ -196,7 +196,7 @@ protected: nsIStyleFrameConstruction* mFrameConstructor; -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS Stopwatch mStyleResolutionWatch; #endif }; @@ -222,7 +222,7 @@ StyleSetImpl::~StyleSetImpl() NS_IF_RELEASE(mRecycler); } -#ifndef RAPTOR_PERF_METRICS +#ifndef MOZ_PERF_METRICS NS_IMPL_ISUPPORTS(StyleSetImpl, kIStyleSetIID) #else NS_IMPL_ISUPPORTS2(StyleSetImpl, nsIStyleSet, nsITimeRecorder) @@ -1096,7 +1096,7 @@ NS_NewStyleSet(nsIStyleSet** aInstancePtrResult) // nsITimeRecorder implementation -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS NS_IMETHODIMP StyleSetImpl::ResetTimer(PRUint32 aTimerID) { diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index 38938274e6c..ab7f05a93d2 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -288,7 +288,7 @@ public: } #endif -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS Stopwatch mWatch; // Measures content model creation time for current document #endif }; @@ -1790,7 +1790,7 @@ NS_IMETHODIMP HTMLContentSink::DidBuildModel(PRInt32 aQualityLevel) { // NRA Dump stopwatch stop info here -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS RAPTOR_STOPWATCH_DEBUGTRACE(("Stop: nsHTMLContentSink::DidBuildModel(), this=%p\n", this)); NS_STOP_STOPWATCH(mWatch) RAPTOR_STOPWATCH_TRACE(("Content creation time (this=%p): ", this)); diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index ad6da9714f5..ac29288aef0 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -489,7 +489,7 @@ protected: // if there is no mWindow, this will keep track of the bounds --dwc0001 nsRect mBounds; -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS Stopwatch mTotalTime; #endif @@ -2068,7 +2068,7 @@ nsWebShell::DoLoadURL(nsIURI * aUri, mProcessedEndDocumentLoad = PR_FALSE; -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS { char* url; nsresult rv = NS_OK; @@ -3296,7 +3296,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, nsresult aStatus, nsIDocumentLoaderObserver * aWebShell) { -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS RAPTOR_STOPWATCH_DEBUGTRACE(("Stop: nsWebShell::OnEndDocumentLoad(), this=%p\n", this)); NS_STOP_STOPWATCH(mTotalTime) RAPTOR_STOPWATCH_TRACE(("Total (Layout + Page Load) Time (webshell=%p): ", this)); diff --git a/mozilla/htmlparser/src/CNavDTD.cpp b/mozilla/htmlparser/src/CNavDTD.cpp index bec75e1fa1d..f18daa315dc 100644 --- a/mozilla/htmlparser/src/CNavDTD.cpp +++ b/mozilla/htmlparser/src/CNavDTD.cpp @@ -81,7 +81,7 @@ static eHTMLTags gWhitespaceTags[]={ #include "nsElementTable.h" -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS # define START_TIMER() \ if(mParser) mParser->mParseTime.Start(PR_FALSE); \ if(mParser) mParser->mDTDTime.Start(PR_FALSE); diff --git a/mozilla/htmlparser/src/makefile.win b/mozilla/htmlparser/src/makefile.win index ff83f08492c..5a6eacf0e06 100644 --- a/mozilla/htmlparser/src/makefile.win +++ b/mozilla/htmlparser/src/makefile.win @@ -22,10 +22,6 @@ include <$(DEPTH)\config\config.mak> LIBRARY_NAME=raptorhtmlpars DEFINES=-D_IMPL_NS_HTMLPARS -DWIN32_LEAN_AND_MEAN -DXML_DTD -!if defined(MOZ_PERF) -DEFINES = $(DEFINES) -DRAPTOR_PERF_METRICS -!endif - MODULE=raptor REQUIRES=xpcom raptor netlib IS_COMPONENT = 1 diff --git a/mozilla/htmlparser/src/nsParser.cpp b/mozilla/htmlparser/src/nsParser.cpp index fbb563d6969..e8b87e5812d 100644 --- a/mozilla/htmlparser/src/nsParser.cpp +++ b/mozilla/htmlparser/src/nsParser.cpp @@ -197,7 +197,7 @@ nsParser::nsParser(nsITokenObserver* anObserver) : mCommand(""), mUnusedInput("" mCharsetSource=kCharsetUninitialized; mInternalState=NS_OK; -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS RAPTOR_STOPWATCH_DEBUGTRACE(("Reset: Parse Time: nsParser::nsParser(), this=%p\n", this)); mParseTime.Reset(); mDTDTime.Reset(); @@ -958,7 +958,7 @@ nsresult nsParser::ResumeParse(nsIDTD* aDefaultDTD, PRBool aIsFinalChunk) { NS_STOP_STOPWATCH(mParseTime); -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS // XXX Don't print out Gecko layout time till I make the save/restore // implementation use a stack. We'll calculate page load + layout time // in the webshell and print that out for now because that is more easy to @@ -1308,7 +1308,7 @@ nsresult nsParser::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUin NS_PRECONDITION(((eOnStart==mParserContext->mStreamListenerState)||(eOnDataAvail==mParserContext->mStreamListenerState)),kOnStartNotCalled); -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS if (0 == sourceOffset) { NS_RESET_AND_START_STOPWATCH(mTotalTime); } diff --git a/mozilla/htmlparser/src/nsParser.h b/mozilla/htmlparser/src/nsParser.h index 665e72f8c0d..027221804ab 100644 --- a/mozilla/htmlparser/src/nsParser.h +++ b/mozilla/htmlparser/src/nsParser.h @@ -390,7 +390,7 @@ protected: nsresult mInternalState; CObserverService mObserverService; -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS public: Stopwatch mTotalTime; Stopwatch mParseTime; diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index 1ff53846550..d202b2d344c 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -66,7 +66,7 @@ #include "nsIScrollPositionListener.h" #include "nsICompositeListener.h" #include "stopwatch.h" -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS #include "nsITimeRecorder.h" #endif @@ -362,7 +362,7 @@ private: void PushCurrentEventFrame(); void PopCurrentEventFrame(); -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS Stopwatch mReflowWatch; // Used for measuring time spent in reflow Stopwatch mFrameCreationWatch; // Used for measuring time spent in frame creation #endif @@ -1247,7 +1247,7 @@ PresShell::EndUpdate(nsIDocument *aDocument) NS_IMETHODIMP PresShell::BeginLoad(nsIDocument *aDocument) { -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS // Reset style resolution stopwatch maintained by style set nsresult rv = NS_OK; nsCOMPtr watch = do_QueryInterface(mStyleSet, &rv); @@ -1262,7 +1262,7 @@ PresShell::BeginLoad(nsIDocument *aDocument) NS_IMETHODIMP PresShell::EndLoad(nsIDocument *aDocument) { -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS // Dump reflow, style resolution and frame construction times here. RAPTOR_STOPWATCH_DEBUGTRACE(("Stop: Reflow: PresShell::EndLoad(), this=%p\n", this)); NS_STOP_STOPWATCH(mReflowWatch) diff --git a/mozilla/layout/base/src/makefile.win b/mozilla/layout/base/src/makefile.win index 84452da4ea0..dd85f7ebc2f 100644 --- a/mozilla/layout/base/src/makefile.win +++ b/mozilla/layout/base/src/makefile.win @@ -22,10 +22,6 @@ DEFINES=-D_IMPL_NS_LAYOUT -DWIN32_LEAN_AND_MEAN !if defined(XP_NEW_SELECTION) DEFINES = $(DEFINES) -DXP_NEW_SELECTION !endif -!if defined(MOZ_PERF) -DEFINES = $(DEFINES) -DRAPTOR_PERF_METRICS -!endif - CPPSRCS = \ nsCommentNode.cpp \ diff --git a/mozilla/layout/base/src/nsStyleSet.cpp b/mozilla/layout/base/src/nsStyleSet.cpp index 865266a09bc..690163ffd03 100644 --- a/mozilla/layout/base/src/nsStyleSet.cpp +++ b/mozilla/layout/base/src/nsStyleSet.cpp @@ -31,7 +31,7 @@ #include "nsIStyleFrameConstruction.h" #include "nsLayoutAtoms.h" #include "stopwatch.h" -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS #include "nsITimeRecorder.h" #endif @@ -40,7 +40,7 @@ static NS_DEFINE_IID(kIStyleFrameConstructionIID, NS_ISTYLE_FRAME_CONSTRUCTION_I class StyleSetImpl : public nsIStyleSet -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS , public nsITimeRecorder #endif { @@ -164,7 +164,7 @@ public: virtual void List(FILE* out = stdout, PRInt32 aIndent = 0); -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS NS_DECL_NSITIMERECORDER #endif @@ -196,7 +196,7 @@ protected: nsIStyleFrameConstruction* mFrameConstructor; -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS Stopwatch mStyleResolutionWatch; #endif }; @@ -222,7 +222,7 @@ StyleSetImpl::~StyleSetImpl() NS_IF_RELEASE(mRecycler); } -#ifndef RAPTOR_PERF_METRICS +#ifndef MOZ_PERF_METRICS NS_IMPL_ISUPPORTS(StyleSetImpl, kIStyleSetIID) #else NS_IMPL_ISUPPORTS2(StyleSetImpl, nsIStyleSet, nsITimeRecorder) @@ -1096,7 +1096,7 @@ NS_NewStyleSet(nsIStyleSet** aInstancePtrResult) // nsITimeRecorder implementation -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS NS_IMETHODIMP StyleSetImpl::ResetTimer(PRUint32 aTimerID) { diff --git a/mozilla/layout/html/base/src/makefile.win b/mozilla/layout/html/base/src/makefile.win index 4c369a4aa76..d627dc05675 100644 --- a/mozilla/layout/html/base/src/makefile.win +++ b/mozilla/layout/html/base/src/makefile.win @@ -24,9 +24,6 @@ DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN !if defined(XP_NEW_SELECTION) DEFINES = $(DEFINES) -DXP_NEW_SELECTION !endif -!if defined(MOZ_PERF) -DEFINES = $(DEFINES) -DRAPTOR_PERF_METRICS -!endif EXPORTS = \ nsIHTMLContent.h \ diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index 1ff53846550..d202b2d344c 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -66,7 +66,7 @@ #include "nsIScrollPositionListener.h" #include "nsICompositeListener.h" #include "stopwatch.h" -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS #include "nsITimeRecorder.h" #endif @@ -362,7 +362,7 @@ private: void PushCurrentEventFrame(); void PopCurrentEventFrame(); -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS Stopwatch mReflowWatch; // Used for measuring time spent in reflow Stopwatch mFrameCreationWatch; // Used for measuring time spent in frame creation #endif @@ -1247,7 +1247,7 @@ PresShell::EndUpdate(nsIDocument *aDocument) NS_IMETHODIMP PresShell::BeginLoad(nsIDocument *aDocument) { -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS // Reset style resolution stopwatch maintained by style set nsresult rv = NS_OK; nsCOMPtr watch = do_QueryInterface(mStyleSet, &rv); @@ -1262,7 +1262,7 @@ PresShell::BeginLoad(nsIDocument *aDocument) NS_IMETHODIMP PresShell::EndLoad(nsIDocument *aDocument) { -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS // Dump reflow, style resolution and frame construction times here. RAPTOR_STOPWATCH_DEBUGTRACE(("Stop: Reflow: PresShell::EndLoad(), this=%p\n", this)); NS_STOP_STOPWATCH(mReflowWatch) diff --git a/mozilla/layout/html/document/src/makefile.win b/mozilla/layout/html/document/src/makefile.win index 3bb5bb4cdc4..68a360142d4 100644 --- a/mozilla/layout/html/document/src/makefile.win +++ b/mozilla/layout/html/document/src/makefile.win @@ -25,9 +25,6 @@ DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN !if defined(XP_NEW_SELECTION) DEFINES = $(DEFINES) -DXP_NEW_SELECTION !endif -!if defined(MOZ_PERF) -DEFINES = $(DEFINES) -DRAPTOR_PERF_METRICS -!endif CPPSRCS= \ nsHTMLContentSink.cpp \ diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp index 38938274e6c..ab7f05a93d2 100644 --- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp @@ -288,7 +288,7 @@ public: } #endif -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS Stopwatch mWatch; // Measures content model creation time for current document #endif }; @@ -1790,7 +1790,7 @@ NS_IMETHODIMP HTMLContentSink::DidBuildModel(PRInt32 aQualityLevel) { // NRA Dump stopwatch stop info here -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS RAPTOR_STOPWATCH_DEBUGTRACE(("Stop: nsHTMLContentSink::DidBuildModel(), this=%p\n", this)); NS_STOP_STOPWATCH(mWatch) RAPTOR_STOPWATCH_TRACE(("Content creation time (this=%p): ", this)); diff --git a/mozilla/layout/style/nsStyleSet.cpp b/mozilla/layout/style/nsStyleSet.cpp index 865266a09bc..690163ffd03 100644 --- a/mozilla/layout/style/nsStyleSet.cpp +++ b/mozilla/layout/style/nsStyleSet.cpp @@ -31,7 +31,7 @@ #include "nsIStyleFrameConstruction.h" #include "nsLayoutAtoms.h" #include "stopwatch.h" -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS #include "nsITimeRecorder.h" #endif @@ -40,7 +40,7 @@ static NS_DEFINE_IID(kIStyleFrameConstructionIID, NS_ISTYLE_FRAME_CONSTRUCTION_I class StyleSetImpl : public nsIStyleSet -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS , public nsITimeRecorder #endif { @@ -164,7 +164,7 @@ public: virtual void List(FILE* out = stdout, PRInt32 aIndent = 0); -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS NS_DECL_NSITIMERECORDER #endif @@ -196,7 +196,7 @@ protected: nsIStyleFrameConstruction* mFrameConstructor; -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS Stopwatch mStyleResolutionWatch; #endif }; @@ -222,7 +222,7 @@ StyleSetImpl::~StyleSetImpl() NS_IF_RELEASE(mRecycler); } -#ifndef RAPTOR_PERF_METRICS +#ifndef MOZ_PERF_METRICS NS_IMPL_ISUPPORTS(StyleSetImpl, kIStyleSetIID) #else NS_IMPL_ISUPPORTS2(StyleSetImpl, nsIStyleSet, nsITimeRecorder) @@ -1096,7 +1096,7 @@ NS_NewStyleSet(nsIStyleSet** aInstancePtrResult) // nsITimeRecorder implementation -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS NS_IMETHODIMP StyleSetImpl::ResetTimer(PRUint32 aTimerID) { diff --git a/mozilla/modules/libutil/public/stopwatch.h b/mozilla/modules/libutil/public/stopwatch.h index 3376f7961ba..8a27f56044f 100644 --- a/mozilla/modules/libutil/public/stopwatch.h +++ b/mozilla/modules/libutil/public/stopwatch.h @@ -10,7 +10,7 @@ const double gTicks = 1.0e-7; #define R__MAC #endif -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS # define NS_RESET_AND_START_STOPWATCH(_sw) \ _sw.Start(PR_TRUE); @@ -35,7 +35,7 @@ const double gTicks = 1.0e-7; #endif -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS static PRLogModuleInfo* gLogStopwatchModule = PR_NewLogModule("timing"); diff --git a/mozilla/modules/libutil/src/makefile.win b/mozilla/modules/libutil/src/makefile.win index 97201c8f818..5a2755e706a 100644 --- a/mozilla/modules/libutil/src/makefile.win +++ b/mozilla/modules/libutil/src/makefile.win @@ -20,15 +20,8 @@ DEPTH=..\..\.. CSRCS=obs.c REQUIRES=nspr util LIBRARY_NAME=util -!if defined(MOZ_PERF) -DEFINES=-DRAPTOR_PERF_METRICS CPPSRCS=stopwatch.cpp CPP_OBJS=.\$(OBJDIR)\stopwatch.obj -LCFLAGS = \ - $(LCFLAGS) \ - $(DEFINES) \ - $(NULL) -!endif C_OBJS=.\$(OBJDIR)\obs.obj diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp index bec75e1fa1d..f18daa315dc 100644 --- a/mozilla/parser/htmlparser/src/CNavDTD.cpp +++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp @@ -81,7 +81,7 @@ static eHTMLTags gWhitespaceTags[]={ #include "nsElementTable.h" -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS # define START_TIMER() \ if(mParser) mParser->mParseTime.Start(PR_FALSE); \ if(mParser) mParser->mDTDTime.Start(PR_FALSE); diff --git a/mozilla/parser/htmlparser/src/makefile.win b/mozilla/parser/htmlparser/src/makefile.win index ff83f08492c..5a6eacf0e06 100644 --- a/mozilla/parser/htmlparser/src/makefile.win +++ b/mozilla/parser/htmlparser/src/makefile.win @@ -22,10 +22,6 @@ include <$(DEPTH)\config\config.mak> LIBRARY_NAME=raptorhtmlpars DEFINES=-D_IMPL_NS_HTMLPARS -DWIN32_LEAN_AND_MEAN -DXML_DTD -!if defined(MOZ_PERF) -DEFINES = $(DEFINES) -DRAPTOR_PERF_METRICS -!endif - MODULE=raptor REQUIRES=xpcom raptor netlib IS_COMPONENT = 1 diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp index fbb563d6969..e8b87e5812d 100644 --- a/mozilla/parser/htmlparser/src/nsParser.cpp +++ b/mozilla/parser/htmlparser/src/nsParser.cpp @@ -197,7 +197,7 @@ nsParser::nsParser(nsITokenObserver* anObserver) : mCommand(""), mUnusedInput("" mCharsetSource=kCharsetUninitialized; mInternalState=NS_OK; -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS RAPTOR_STOPWATCH_DEBUGTRACE(("Reset: Parse Time: nsParser::nsParser(), this=%p\n", this)); mParseTime.Reset(); mDTDTime.Reset(); @@ -958,7 +958,7 @@ nsresult nsParser::ResumeParse(nsIDTD* aDefaultDTD, PRBool aIsFinalChunk) { NS_STOP_STOPWATCH(mParseTime); -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS // XXX Don't print out Gecko layout time till I make the save/restore // implementation use a stack. We'll calculate page load + layout time // in the webshell and print that out for now because that is more easy to @@ -1308,7 +1308,7 @@ nsresult nsParser::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUin NS_PRECONDITION(((eOnStart==mParserContext->mStreamListenerState)||(eOnDataAvail==mParserContext->mStreamListenerState)),kOnStartNotCalled); -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS if (0 == sourceOffset) { NS_RESET_AND_START_STOPWATCH(mTotalTime); } diff --git a/mozilla/parser/htmlparser/src/nsParser.h b/mozilla/parser/htmlparser/src/nsParser.h index 665e72f8c0d..027221804ab 100644 --- a/mozilla/parser/htmlparser/src/nsParser.h +++ b/mozilla/parser/htmlparser/src/nsParser.h @@ -390,7 +390,7 @@ protected: nsresult mInternalState; CObserverService mObserverService; -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS public: Stopwatch mTotalTime; Stopwatch mParseTime; diff --git a/mozilla/webshell/src/makefile.win b/mozilla/webshell/src/makefile.win index c8ed4142537..2fdff3913de 100644 --- a/mozilla/webshell/src/makefile.win +++ b/mozilla/webshell/src/makefile.win @@ -20,9 +20,6 @@ include <$(DEPTH)/config/config.mak> DEFINES=-D_IMPL_NS_WEB -DWIN32_LEAN_AND_MEAN -!if defined(MOZ_PERF) -DEFINES = $(DEFINES) -DRAPTOR_PERF_METRICS -!endif MODULE=raptor CPPSRCS= \ diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index ad6da9714f5..ac29288aef0 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -489,7 +489,7 @@ protected: // if there is no mWindow, this will keep track of the bounds --dwc0001 nsRect mBounds; -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS Stopwatch mTotalTime; #endif @@ -2068,7 +2068,7 @@ nsWebShell::DoLoadURL(nsIURI * aUri, mProcessedEndDocumentLoad = PR_FALSE; -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS { char* url; nsresult rv = NS_OK; @@ -3296,7 +3296,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, nsresult aStatus, nsIDocumentLoaderObserver * aWebShell) { -#ifdef RAPTOR_PERF_METRICS +#ifdef MOZ_PERF_METRICS RAPTOR_STOPWATCH_DEBUGTRACE(("Stop: nsWebShell::OnEndDocumentLoad(), this=%p\n", this)); NS_STOP_STOPWATCH(mTotalTime) RAPTOR_STOPWATCH_TRACE(("Total (Layout + Page Load) Time (webshell=%p): ", this));