From 8169ada6296adad07a1dba489b2faf3f768088a7 Mon Sep 17 00:00:00 2001
From: "jruderman%hmc.edu"
 <jruderman%hmc.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 7 Jul 2007 23:53:00 +0000
Subject: [PATCH] Bug 99319, Silence startup printf "Note: styleverifytree is
 disabled" and friends in the "disabled" case. Patch by Ryan Jones,
 r+sr=bzbarsky.

git-svn-id: svn://10.0.0.236/trunk@229493 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/base/nsPresShell.cpp | 34 ++++++++++++++---------------
 mozilla/layout/generic/nsFrame.cpp  |  4 ----
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp
index fc63f9b5452..0bdcf10fa04 100644
--- a/mozilla/layout/base/nsPresShell.cpp
+++ b/mozilla/layout/base/nsPresShell.cpp
@@ -1284,25 +1284,25 @@ nsIPresShell::GetVerifyReflowEnable()
 
     if (VERIFY_REFLOW_ON & gVerifyReflowFlags) {
       gVerifyReflowEnabled = PR_TRUE;
-    }
-    printf("Note: verifyreflow is %sabled",
-           gVerifyReflowEnabled ? "en" : "dis");
-    if (VERIFY_REFLOW_NOISY & gVerifyReflowFlags) {
-      printf(" (noisy)");
-    }
-    if (VERIFY_REFLOW_ALL & gVerifyReflowFlags) {
-      printf(" (all)");
-    }
-    if (VERIFY_REFLOW_DUMP_COMMANDS & gVerifyReflowFlags) {
-      printf(" (show reflow commands)");
-    }
-    if (VERIFY_REFLOW_NOISY_RC & gVerifyReflowFlags) {
-      printf(" (noisy reflow commands)");
-      if (VERIFY_REFLOW_REALLY_NOISY_RC & gVerifyReflowFlags) {
-        printf(" (REALLY noisy reflow commands)");
+
+      printf("Note: verifyreflow is enabled");
+      if (VERIFY_REFLOW_NOISY & gVerifyReflowFlags) {
+        printf(" (noisy)");
       }
+      if (VERIFY_REFLOW_ALL & gVerifyReflowFlags) {
+        printf(" (all)");
+      }
+      if (VERIFY_REFLOW_DUMP_COMMANDS & gVerifyReflowFlags) {
+        printf(" (show reflow commands)");
+      }
+      if (VERIFY_REFLOW_NOISY_RC & gVerifyReflowFlags) {
+        printf(" (noisy reflow commands)");
+        if (VERIFY_REFLOW_REALLY_NOISY_RC & gVerifyReflowFlags) {
+          printf(" (REALLY noisy reflow commands)");
+        }
+      }
+      printf("\n");
     }
-    printf("\n");
   }
 #endif
   return gVerifyReflowEnabled;
diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp
index 13e544abd86..05003c63710 100644
--- a/mozilla/layout/generic/nsFrame.cpp
+++ b/mozilla/layout/generic/nsFrame.cpp
@@ -216,8 +216,6 @@ nsIFrameDebug::GetVerifyTreeEnable()
     if (nsnull == gFrameVerifyTreeLogModuleInfo) {
       gFrameVerifyTreeLogModuleInfo = PR_NewLogModule("frameverifytree");
       gFrameVerifyTreeEnable = 0 != gFrameVerifyTreeLogModuleInfo->level;
-      printf("Note: frameverifytree is %sabled\n",
-             gFrameVerifyTreeEnable ? "en" : "dis");
     }
   }
   return gFrameVerifyTreeEnable;
@@ -240,8 +238,6 @@ nsIFrameDebug::GetVerifyStyleTreeEnable()
     if (nsnull == gStyleVerifyTreeLogModuleInfo) {
       gStyleVerifyTreeLogModuleInfo = PR_NewLogModule("styleverifytree");
       gStyleVerifyTreeEnable = 0 != gStyleVerifyTreeLogModuleInfo->level;
-      printf("Note: styleverifytree is %sabled\n",
-             gStyleVerifyTreeEnable ? "en" : "dis");
     }
   }
   return gStyleVerifyTreeEnable;