diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index 99c9a1fcd0d..eb17f80b82c 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/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/mozilla/layout/generic/nsBlockFrame.h b/mozilla/layout/generic/nsBlockFrame.h
index 50dd7088088..104d812aa5b 100644
--- a/mozilla/layout/generic/nsBlockFrame.h
+++ b/mozilla/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/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp
index 99c9a1fcd0d..eb17f80b82c 100644
--- a/mozilla/layout/generic/nsBlockReflowState.cpp
+++ b/mozilla/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/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h
index 99c9a1fcd0d..eb17f80b82c 100644
--- a/mozilla/layout/generic/nsBlockReflowState.h
+++ b/mozilla/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/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index 99c9a1fcd0d..eb17f80b82c 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/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/mozilla/layout/html/base/src/nsBlockFrame.h b/mozilla/layout/html/base/src/nsBlockFrame.h
index 50dd7088088..104d812aa5b 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.h
+++ b/mozilla/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/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
index 99c9a1fcd0d..eb17f80b82c 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp
+++ b/mozilla/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/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h
index 99c9a1fcd0d..eb17f80b82c 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.h
+++ b/mozilla/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
 
 //----------------------------------------------------------------------