diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 3688ffed5ff..e83a3e24d81 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -6593,7 +6593,7 @@ nsBlockFrame::BlockNeedsSpaceManager(nsIFrame* aBlock) return (aBlock->GetStateBits() & NS_BLOCK_SPACE_MGR) || (parent && !parent->IsFloatContainingBlock()); } - + #ifdef IBMBIDI nsresult nsBlockFrame::ResolveBidi() diff --git a/mozilla/layout/generic/nsBlockFrame.h b/mozilla/layout/generic/nsBlockFrame.h index 972430e948c..f362d7d1cde 100644 --- a/mozilla/layout/generic/nsBlockFrame.h +++ b/mozilla/layout/generic/nsBlockFrame.h @@ -109,7 +109,7 @@ class nsIntervalSet; */ // see nsHTMLParts.h for the public block state bits -#define NS_BLOCK_NEEDS_BIDI_RESOLUTION 0x00100000 +#define NS_BLOCK_NEEDS_BIDI_RESOLUTION 0x00100000 #define NS_BLOCK_HAS_LINE_CURSOR 0x01000000 #define NS_BLOCK_HAS_OVERFLOW_LINES 0x02000000 #define NS_BLOCK_HAS_OVERFLOW_OUT_OF_FLOWS 0x04000000 diff --git a/mozilla/layout/generic/nsHTMLParts.h b/mozilla/layout/generic/nsHTMLParts.h index 4ea52e92c73..c2334962eaf 100644 --- a/mozilla/layout/generic/nsHTMLParts.h +++ b/mozilla/layout/generic/nsHTMLParts.h @@ -68,7 +68,7 @@ class nsIChannel; #define NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET 0x40000000 // 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 0xF0E00000 +#define NS_BLOCK_FLAGS_MASK 0xF0E00000 // Factory methods for creating html layout objects