Move frame bit #defines into an anonymous enum, to aid debuggers in determining their values, since the two I've used can't do so, at least not with the default build options. rs=roc

layout/generic/nsIFrame.h

@@ -140,48 +140,50 @@ typedef PRUint32 nsSplittableType;
  */
 typedef PRUint32 nsFrameState;
 
-#define NS_FRAME_IN_REFLOW                            0x00000001
+enum {
+  NS_FRAME_IN_REFLOW =                          0x00000001,
+
   // This is only set during painting
-#define NS_FRAME_FORCE_DISPLAY_LIST_DESCEND_INTO      0x00000001
+  NS_FRAME_FORCE_DISPLAY_LIST_DESCEND_INTO =    0x00000001,
 
   // This bit is set when a frame is created. After it has been reflowed
   // once (during the DidReflow with a finished state) the bit is
   // cleared.
-#define NS_FRAME_FIRST_REFLOW                         0x00000002
+  NS_FRAME_FIRST_REFLOW =                       0x00000002,
 
   // For a continuation frame, if this bit is set, then this a "fluid" 
   // continuation, i.e., across a line boundary. Otherwise it's a "hard"
   // continuation, e.g. a bidi continuation.
-#define NS_FRAME_IS_FLUID_CONTINUATION                0x00000004
+  NS_FRAME_IS_FLUID_CONTINUATION =              0x00000004,
 
   // This bit is set when the frame's overflow rect is
   // different from its border rect (i.e. GetOverflowRect() != GetRect())
-#define NS_FRAME_OUTSIDE_CHILDREN                     0x00000008
+  NS_FRAME_OUTSIDE_CHILDREN =                   0x00000008,
 
   // If this bit is set, then a reference to the frame is being held
   // elsewhere.  The frame may want to send a notification when it is
   // destroyed to allow these references to be cleared.
-#define NS_FRAME_EXTERNAL_REFERENCE                   0x00000010
+  NS_FRAME_EXTERNAL_REFERENCE =                 0x00000010,
 
   // If this bit is set, this frame or one of its descendants has a
   // percentage height that depends on an ancestor of this frame.
   // (Or it did at one point in the past, since we don't necessarily clear
   // the bit when it's no longer needed; it's an optimization.)
-#define NS_FRAME_CONTAINS_RELATIVE_HEIGHT             0x00000020
+  NS_FRAME_CONTAINS_RELATIVE_HEIGHT =           0x00000020,
 
   // If this bit is set, then the frame corresponds to generated content
-#define NS_FRAME_GENERATED_CONTENT                    0x00000040
+  NS_FRAME_GENERATED_CONTENT =                  0x00000040,
 
   // If this bit is set, then the frame uses XUL flexible box layout
   // for its children.
-#define NS_FRAME_IS_BOX                               0x00000080
+  NS_FRAME_IS_BOX =                             0x00000080,
 
   // If this bit is set, then the frame has been moved out of the flow,
   // e.g., it is absolutely positioned or floated
-#define NS_FRAME_OUT_OF_FLOW                          0x00000100
+  NS_FRAME_OUT_OF_FLOW =                        0x00000100,
 
   // If this bit is set, then the frame reflects content that may be selected
-#define NS_FRAME_SELECTED_CONTENT                     0x00000200
+  NS_FRAME_SELECTED_CONTENT =                   0x00000200,
 
   // If this bit is set, then the frame is dirty and needs to be reflowed.
   // This bit is set when the frame is first created.
@@ -189,10 +191,10 @@ typedef PRUint32 nsFrameState;
   // finished.
   // Do not set this bit yourself if you plan to pass the frame to
   // nsIPresShell::FrameNeedsReflow.  Pass the right arguments instead.
-#define NS_FRAME_IS_DIRTY                             0x00000400
+  NS_FRAME_IS_DIRTY =                           0x00000400,
 
   // If this bit is set then the frame is unflowable.
-#define NS_FRAME_IS_UNFLOWABLE                        0x00000800
+  NS_FRAME_IS_UNFLOWABLE =                      0x00000800,
 
   // If this bit is set, either:
   //  1. the frame has children that have either NS_FRAME_IS_DIRTY or
@@ -204,49 +206,51 @@ typedef PRUint32 nsFrameState;
   // finished.
   // Do not set this bit yourself if you plan to pass the frame to
   // nsIPresShell::FrameNeedsReflow.  Pass the right arguments instead.
-#define NS_FRAME_HAS_DIRTY_CHILDREN                   0x00001000
+  NS_FRAME_HAS_DIRTY_CHILDREN =                 0x00001000,
 
   // If this bit is set, the frame has an associated view
-#define NS_FRAME_HAS_VIEW                             0x00002000
+  NS_FRAME_HAS_VIEW =                           0x00002000,
 
   // If this bit is set, the frame was created from anonymous content.
-#define NS_FRAME_INDEPENDENT_SELECTION                0x00004000
+  NS_FRAME_INDEPENDENT_SELECTION =              0x00004000,
 
   // If this bit is set, the frame is "special" (lame term, I know),
   // which means that it is part of the mangled frame hierarchy that
   // results when an inline has been split because of a nested block.
-#define NS_FRAME_IS_SPECIAL                           0x00008000
+  NS_FRAME_IS_SPECIAL =                         0x00008000,
 
   // If this bit is set, the frame doesn't allow ignorable whitespace as
   // children. For example, the whitespace between <table>\n<tr>\n<td>
   // will be excluded during the construction of children. 
   // The bit is set when the frame is first created and remain
   // unchanged during the life-time of the frame.
-#define NS_FRAME_EXCLUDE_IGNORABLE_WHITESPACE         0x00010000
+  NS_FRAME_EXCLUDE_IGNORABLE_WHITESPACE =       0x00010000,
 
 #ifdef IBMBIDI
   // If this bit is set, the frame itself is a bidi continuation,
   // or is incomplete (its next sibling is a bidi continuation)
-#define NS_FRAME_IS_BIDI                              0x00020000
+  NS_FRAME_IS_BIDI =                            0x00020000,
 #endif
 
   // If this bit is set the frame has descendant with a view
-#define NS_FRAME_HAS_CHILD_WITH_VIEW                  0x00040000
+  NS_FRAME_HAS_CHILD_WITH_VIEW =                0x00040000,
 
   // If this bit is set, then reflow may be dispatched from the current
   // frame instead of the root frame.
-#define NS_FRAME_REFLOW_ROOT                          0x00080000
+  NS_FRAME_REFLOW_ROOT =                        0x00080000,
 
   // The lower 20 bits of the frame state word are reserved by this API.
-#define NS_FRAME_RESERVED                             0x000FFFFF
+  NS_FRAME_RESERVED =                           0x000FFFFF,
 
   // The upper 12 bits of the frame state word are reserved for frame
   // implementations.
-#define NS_FRAME_IMPL_RESERVED                        0xFFF00000
+  NS_FRAME_IMPL_RESERVED =                      0xFFF00000,
 
   // Box layout bits
-#define NS_STATE_IS_HORIZONTAL                        0x00400000
-#define NS_STATE_IS_DIRECTION_NORMAL                  0x80000000
+  NS_STATE_IS_HORIZONTAL =                      0x00400000,
+  NS_STATE_IS_DIRECTION_NORMAL =                0x80000000,
+
+};
 
 // Helper macros
 #define NS_SUBTREE_DIRTY(_frame)  \