From 9f30b1be63040b0ab357d95b0e3522cdd99f15ed Mon Sep 17 00:00:00 2001 From: troy Date: Mon, 11 May 1998 18:54:15 +0000 Subject: [PATCH] Wrapped VerifyLines() inside of a NS_DEBUG #define --- layout/generic/nsBlockFrame.cpp | 6 ++++++ layout/generic/nsBlockFrame.h | 2 ++ layout/generic/nsBlockReflowState.cpp | 6 ++++++ layout/generic/nsBlockReflowState.h | 6 ++++++ layout/html/base/src/nsBlockFrame.cpp | 6 ++++++ layout/html/base/src/nsBlockFrame.h | 2 ++ layout/html/base/src/nsBlockReflowState.cpp | 6 ++++++ layout/html/base/src/nsBlockReflowState.h | 6 ++++++ 8 files changed, 40 insertions(+) diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index 99c9a1fcd0d7..eb17f80b82c5 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -327,14 +327,19 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const NS_METHOD nsBlockFrame::VerifyTree() const { +#ifdef NS_DEBUG nsresult rv = nsHTMLContainerFrame::VerifyTree(); if (NS_OK != rv) { return rv; } rv = VerifyLines(PR_TRUE); +#else + rv = NS_OK; +#endif return rv; } +#ifdef NS_DEBUG nsresult nsBlockFrame::VerifyLines(PRBool aFinalCheck) const { @@ -381,6 +386,7 @@ nsBlockFrame::VerifyLines(PRBool aFinalCheck) const return rv; } +#endif //---------------------------------------------------------------------- diff --git a/layout/generic/nsBlockFrame.h b/layout/generic/nsBlockFrame.h index 50dd7088088e..104d812aa5b7 100644 --- a/layout/generic/nsBlockFrame.h +++ b/layout/generic/nsBlockFrame.h @@ -265,7 +265,9 @@ protected: nsLineData* CreateLineForOverflowList(nsIFrame* aOverflowList); +#ifdef NS_DEBUG nsresult VerifyLines(PRBool aFinalCheck) const; +#endif nsresult PlaceLine(nsBlockReflowState& aState, nsLineLayout& aLineLayout, diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp index 99c9a1fcd0d7..eb17f80b82c5 100644 --- a/layout/generic/nsBlockReflowState.cpp +++ b/layout/generic/nsBlockReflowState.cpp @@ -327,14 +327,19 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const NS_METHOD nsBlockFrame::VerifyTree() const { +#ifdef NS_DEBUG nsresult rv = nsHTMLContainerFrame::VerifyTree(); if (NS_OK != rv) { return rv; } rv = VerifyLines(PR_TRUE); +#else + rv = NS_OK; +#endif return rv; } +#ifdef NS_DEBUG nsresult nsBlockFrame::VerifyLines(PRBool aFinalCheck) const { @@ -381,6 +386,7 @@ nsBlockFrame::VerifyLines(PRBool aFinalCheck) const return rv; } +#endif //---------------------------------------------------------------------- diff --git a/layout/generic/nsBlockReflowState.h b/layout/generic/nsBlockReflowState.h index 99c9a1fcd0d7..eb17f80b82c5 100644 --- a/layout/generic/nsBlockReflowState.h +++ b/layout/generic/nsBlockReflowState.h @@ -327,14 +327,19 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const NS_METHOD nsBlockFrame::VerifyTree() const { +#ifdef NS_DEBUG nsresult rv = nsHTMLContainerFrame::VerifyTree(); if (NS_OK != rv) { return rv; } rv = VerifyLines(PR_TRUE); +#else + rv = NS_OK; +#endif return rv; } +#ifdef NS_DEBUG nsresult nsBlockFrame::VerifyLines(PRBool aFinalCheck) const { @@ -381,6 +386,7 @@ nsBlockFrame::VerifyLines(PRBool aFinalCheck) const return rv; } +#endif //---------------------------------------------------------------------- diff --git a/layout/html/base/src/nsBlockFrame.cpp b/layout/html/base/src/nsBlockFrame.cpp index 99c9a1fcd0d7..eb17f80b82c5 100644 --- a/layout/html/base/src/nsBlockFrame.cpp +++ b/layout/html/base/src/nsBlockFrame.cpp @@ -327,14 +327,19 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const NS_METHOD nsBlockFrame::VerifyTree() const { +#ifdef NS_DEBUG nsresult rv = nsHTMLContainerFrame::VerifyTree(); if (NS_OK != rv) { return rv; } rv = VerifyLines(PR_TRUE); +#else + rv = NS_OK; +#endif return rv; } +#ifdef NS_DEBUG nsresult nsBlockFrame::VerifyLines(PRBool aFinalCheck) const { @@ -381,6 +386,7 @@ nsBlockFrame::VerifyLines(PRBool aFinalCheck) const return rv; } +#endif //---------------------------------------------------------------------- diff --git a/layout/html/base/src/nsBlockFrame.h b/layout/html/base/src/nsBlockFrame.h index 50dd7088088e..104d812aa5b7 100644 --- a/layout/html/base/src/nsBlockFrame.h +++ b/layout/html/base/src/nsBlockFrame.h @@ -265,7 +265,9 @@ protected: nsLineData* CreateLineForOverflowList(nsIFrame* aOverflowList); +#ifdef NS_DEBUG nsresult VerifyLines(PRBool aFinalCheck) const; +#endif nsresult PlaceLine(nsBlockReflowState& aState, nsLineLayout& aLineLayout, diff --git a/layout/html/base/src/nsBlockReflowState.cpp b/layout/html/base/src/nsBlockReflowState.cpp index 99c9a1fcd0d7..eb17f80b82c5 100644 --- a/layout/html/base/src/nsBlockReflowState.cpp +++ b/layout/html/base/src/nsBlockReflowState.cpp @@ -327,14 +327,19 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const NS_METHOD nsBlockFrame::VerifyTree() const { +#ifdef NS_DEBUG nsresult rv = nsHTMLContainerFrame::VerifyTree(); if (NS_OK != rv) { return rv; } rv = VerifyLines(PR_TRUE); +#else + rv = NS_OK; +#endif return rv; } +#ifdef NS_DEBUG nsresult nsBlockFrame::VerifyLines(PRBool aFinalCheck) const { @@ -381,6 +386,7 @@ nsBlockFrame::VerifyLines(PRBool aFinalCheck) const return rv; } +#endif //---------------------------------------------------------------------- diff --git a/layout/html/base/src/nsBlockReflowState.h b/layout/html/base/src/nsBlockReflowState.h index 99c9a1fcd0d7..eb17f80b82c5 100644 --- a/layout/html/base/src/nsBlockReflowState.h +++ b/layout/html/base/src/nsBlockReflowState.h @@ -327,14 +327,19 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const NS_METHOD nsBlockFrame::VerifyTree() const { +#ifdef NS_DEBUG nsresult rv = nsHTMLContainerFrame::VerifyTree(); if (NS_OK != rv) { return rv; } rv = VerifyLines(PR_TRUE); +#else + rv = NS_OK; +#endif return rv; } +#ifdef NS_DEBUG nsresult nsBlockFrame::VerifyLines(PRBool aFinalCheck) const { @@ -381,6 +386,7 @@ nsBlockFrame::VerifyLines(PRBool aFinalCheck) const return rv; } +#endif //----------------------------------------------------------------------