Remove unused frame state bits. (Bug 570837) r=roc
authorL. David Baron <dbaron@dbaron.org>
Tue, 08 Jun 2010 22:28:14 -0700
changeset 43378 5d4130a21bf2b02eb1c595b96fc5ff3c007e51a4
parent 43377 04eaa2543795ec5b763afbccc01c83cb28475df5
child 43379 3680d856d412698853645e1d630953b461be7f28
push idunknown
push userunknown
push dateunknown
reviewersroc
bugs570837
milestone1.9.3a5pre
Remove unused frame state bits. (Bug 570837) r=roc
layout/generic/nsHTMLParts.h
layout/generic/nsInlineFrame.h
layout/tables/nsTableColFrame.cpp
--- a/layout/generic/nsHTMLParts.h
+++ b/layout/generic/nsHTMLParts.h
@@ -65,26 +65,24 @@ class nsTableColFrame;
  * NS_BLOCK_HAS_FIRST_LETTER_STYLE means that the block has first-letter style,
  *  even if it has no actual first-letter frame among its descendants.
  *
  * NS_BLOCK_HAS_FIRST_LETTER_CHILD means that there is an inflow first-letter
  *  frame among the block's descendants. If there is a floating first-letter
  *  frame, or the block has first-letter style but has no first letter, this
  *  bit is not set. This bit is set on the first continuation only.
  */
-#define NS_BLOCK_NO_AUTO_MARGINS          NS_FRAME_STATE_BIT(21)
 #define NS_BLOCK_MARGIN_ROOT              NS_FRAME_STATE_BIT(22)
 #define NS_BLOCK_FLOAT_MGR                NS_FRAME_STATE_BIT(23)
 #define NS_BLOCK_HAS_FIRST_LETTER_STYLE   NS_FRAME_STATE_BIT(29)
 #define NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET NS_FRAME_STATE_BIT(30)
 #define NS_BLOCK_HAS_FIRST_LETTER_CHILD   NS_FRAME_STATE_BIT(31)
 // These are the bits that get inherited from a block frame to its
 // next-in-flows and are not private to blocks
-#define NS_BLOCK_FLAGS_MASK               (NS_BLOCK_NO_AUTO_MARGINS | \
-                                           NS_BLOCK_MARGIN_ROOT | \
+#define NS_BLOCK_FLAGS_MASK               (NS_BLOCK_MARGIN_ROOT | \
                                            NS_BLOCK_FLOAT_MGR | \
                                            NS_BLOCK_HAS_FIRST_LETTER_STYLE | \
                                            NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET | \
                                            NS_BLOCK_HAS_FIRST_LETTER_CHILD)
 
 // Factory methods for creating html layout objects
 
 // Create a frame that supports "display: block" layout behavior
--- a/layout/generic/nsInlineFrame.h
+++ b/layout/generic/nsInlineFrame.h
@@ -43,24 +43,16 @@
 #include "nsHTMLContainerFrame.h"
 #include "nsAbsoluteContainingBlock.h"
 #include "nsLineLayout.h"
 
 class nsAnonymousBlockFrame;
 
 #define nsInlineFrameSuper nsHTMLContainerFrame
 
-// NS_INLINE_FRAME_HARD_TEXT_OFFSETS is used for access keys, where what
-// would normally be 1 text frame is split into 3 sets of an inline parent 
-// and text child (the pre access key text, the underlined key text, and
-// the post access key text). The offsets of the 3 text frame children
-// are set in nsCSSFrameConstructor
-
-#define NS_INLINE_FRAME_HARD_TEXT_OFFSETS            NS_FRAME_STATE_BIT(20)
-
 /**  In Bidi left (or right) margin/padding/border should be applied to left
  *  (or right) most frame (or a continuation frame).
  *  This state value shows if this frame is left (or right) most continuation
  *  or not.
  */
 #define NS_INLINE_FRAME_BIDI_VISUAL_STATE_IS_SET     NS_FRAME_STATE_BIT(21)
 
 #define NS_INLINE_FRAME_BIDI_VISUAL_IS_LEFT_MOST     NS_FRAME_STATE_BIT(22)
--- a/layout/tables/nsTableColFrame.cpp
+++ b/layout/tables/nsTableColFrame.cpp
@@ -47,21 +47,16 @@
 #include "nsIDOMHTMLTableColElement.h"
 
 #define COL_TYPE_BITS                 (NS_FRAME_STATE_BIT(28) | \
                                        NS_FRAME_STATE_BIT(29) | \
                                        NS_FRAME_STATE_BIT(30) | \
                                        NS_FRAME_STATE_BIT(31))
 #define COL_TYPE_OFFSET               28
 
-#define COL_CONSTRAINT_BITS           (NS_FRAME_STATE_BIT(24) | \
-                                       NS_FRAME_STATE_BIT(25) | \
-                                       NS_FRAME_STATE_BIT(26))
-#define COL_CONSTRAINT_OFFSET         24
-
 nsTableColFrame::nsTableColFrame(nsStyleContext* aContext) :
   nsSplittableFrame(aContext)
 {
   SetColType(eColContent);
   ResetIntrinsics();
   ResetSpanIntrinsics();
   ResetFinalWidth();
 }