Bug 1275744 - Reference MOZ_LOG in layout comments. r=erahm draft
authorRalph Giles <giles@mozilla.com>
Thu, 26 May 2016 11:40:17 -0700
changeset 377605 850cf36d73eaa503dc9f0fad1dcadd9d097bb0c9
parent 377604 414c36ba498bf22e71b2407f6ce6291e1b8ec527
child 377606 c13f09d58764f76b1e398a3699460ec4f1dd61cd
push id20838
push userbmo:giles@thaumas.net
push dateFri, 10 Jun 2016 20:57:58 +0000
reviewerserahm
bugs1275744
milestone50.0a1
Bug 1275744 - Reference MOZ_LOG in layout comments. r=erahm NSPR_LOG_MODULES is deprecated. MozReview-Commit-ID: KGA9AzNUqnP
layout/base/LayoutLogging.h
layout/base/nsIPresShell.h
layout/generic/nsFrame.h
--- a/layout/base/LayoutLogging.h
+++ b/layout/base/LayoutLogging.h
@@ -12,17 +12,17 @@
  * Retrieves the log module to use for layout logging.
  */
 static mozilla::LazyLogModule sLayoutLog("layout");
 
 /**
  * Use the layout log to warn if a given condition is false.
  *
  * This is only enabled in debug builds and the logging is only displayed if
- * the environmental variable NSPR_LOG_MODULES includes "layout:2" (or higher).
+ * the environmental variable MOZ_LOG includes "layout:2" (or higher).
  */
 #ifdef DEBUG
 #define LAYOUT_WARN_IF_FALSE(_cond, _msg)                                  \
   PR_BEGIN_MACRO                                                           \
     if (MOZ_LOG_TEST(sLayoutLog, mozilla::LogLevel::Warning) &&        \
         !(_cond)) {                                                        \
       mozilla::detail::LayoutLogWarning(_msg, #_cond, __FILE__, __LINE__); \
     }                                                                      \
@@ -32,17 +32,17 @@ static mozilla::LazyLogModule sLayoutLog
   PR_BEGIN_MACRO                          \
   PR_END_MACRO
 #endif
 
 /**
  * Use the layout log to emit a warning with the same format as NS_WARNING.
  *
  * This is only enabled in debug builds and the logging is only displayed if
- * the environmental variable NSPR_LOG_MODULES includes "layout:2" (or higher).
+ * the environmental variable MOZ_LOG includes "layout:2" (or higher).
  */
 #ifdef DEBUG
 #define LAYOUT_WARNING(_msg)                                                \
   PR_BEGIN_MACRO                                                            \
     if (MOZ_LOG_TEST(sLayoutLog, mozilla::LogLevel::Warning)) {         \
       mozilla::detail::LayoutLogWarning(_msg, nullptr, __FILE__, __LINE__); \
     }                                                                       \
   PR_END_MACRO
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -969,19 +969,18 @@ public:
    * Notify that a content node's state has changed
    */
   virtual void ContentStateChanged(nsIDocument* aDocument,
                                    nsIContent* aContent,
                                    mozilla::EventStates aStateMask) = 0;
 
   /**
    * See if reflow verification is enabled. To enable reflow verification add
-   * "verifyreflow:1" to your NSPR_LOG_MODULES environment variable
-   * (any non-zero debug level will work). Or, call SetVerifyReflowEnable
-   * with true.
+   * "verifyreflow:1" to your MOZ_LOG environment variable (any non-zero
+   * debug level will work). Or, call SetVerifyReflowEnable with true.
    */
   static bool GetVerifyReflowEnable();
 
   /**
    * Set the verify-reflow enable flag.
    */
   static void SetVerifyReflowEnable(bool aEnabled);
 
--- a/layout/generic/nsFrame.h
+++ b/layout/generic/nsFrame.h
@@ -711,17 +711,17 @@ public:
    * the caveat that some base types are defined.
    * For more information, see XXX.
    */
   virtual nsresult  DumpRegressionData(nsPresContext* aPresContext,
                                        FILE* out, int32_t aIndent) override;
 
   /**
    * See if style tree verification is enabled. To enable style tree
-   * verification add "styleverifytree:1" to your NSPR_LOG_MODULES
+   * verification add "styleverifytree:1" to your MOZ_LOG
    * environment variable (any non-zero debug level will work). Or,
    * call SetVerifyStyleTreeEnable with true.
    */
   static bool GetVerifyStyleTreeEnable();
 
   /**
    * Set the verify-style-tree enable flag.
    */