зеркало из https://github.com/mozilla/pjs.git
Shift frame-state bits in implementations to the 12 higher bits - bug 68411 r=karnaze sr=waterson
This commit is contained in:
Родитель
ea2b429682
Коммит
c8e811acd0
|
@ -40,13 +40,6 @@ class nsFirstLineFrame;
|
|||
#define NS_BLOCK_FRAME_ABSOLUTE_LIST_INDEX 2
|
||||
#define NS_BLOCK_FRAME_LAST_LIST_INDEX NS_BLOCK_FRAME_ABSOLUTE_LIST_INDEX
|
||||
|
||||
/**
|
||||
* Additional frame-state bits. There are more of these bits
|
||||
* defined in nsHTMLParts.h (XXX: note: this should be cleaned up)
|
||||
*/
|
||||
#define NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET 0x40000000
|
||||
#define NS_BLOCK_HAS_FIRST_LETTER_STYLE 0x20000000
|
||||
|
||||
#define nsBlockFrameSuper nsHTMLContainerFrame
|
||||
|
||||
#define NS_BLOCK_FRAME_CID \
|
||||
|
|
|
@ -41,6 +41,19 @@ class nsString;
|
|||
class nsIWebShell;
|
||||
class nsIPresShell;
|
||||
|
||||
/**
|
||||
* Additional frame-state bits used by nsBlockFrame
|
||||
* See the meanings at http://www.mozilla.org/newlayout/doc/block-and-line.html
|
||||
*/
|
||||
#define NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET 0x40000000
|
||||
#define NS_BLOCK_HAS_FIRST_LETTER_STYLE 0x20000000
|
||||
#define NS_BLOCK_SHRINK_WRAP 0x00100000
|
||||
#define NS_BLOCK_NO_AUTO_MARGINS 0x00200000
|
||||
#define NS_BLOCK_MARGIN_ROOT 0x00400000
|
||||
#define NS_BLOCK_SPACE_MGR 0x00800000
|
||||
#define NS_BLOCK_WRAP_SIZE 0x01000000
|
||||
#define NS_BLOCK_FLAGS_MASK 0xFFF00000
|
||||
|
||||
// Factory method for creating a content iterator for generated
|
||||
// content
|
||||
extern nsresult
|
||||
|
@ -254,14 +267,6 @@ NS_CreateHTMLElement(nsIHTMLContent** aResult,
|
|||
// These are variations on AreaFrame with slightly different layout
|
||||
// policies.
|
||||
|
||||
// Flags for block/area frames
|
||||
#define NS_BLOCK_SHRINK_WRAP 0x00010000
|
||||
#define NS_BLOCK_NO_AUTO_MARGINS 0x00020000
|
||||
#define NS_BLOCK_MARGIN_ROOT 0x00040000
|
||||
#define NS_BLOCK_SPACE_MGR 0x00080000
|
||||
#define NS_BLOCK_WRAP_SIZE 0x00100000
|
||||
#define NS_BLOCK_FLAGS_MASK 0x00ff0000
|
||||
|
||||
// Create a frame that supports "display: block" layout behavior
|
||||
extern nsresult NS_NewBlockFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame,
|
||||
PRUint32 aFlags = 0);
|
||||
|
|
|
@ -33,7 +33,7 @@ class nsAnonymousBlockFrame;
|
|||
|
||||
#define nsInlineFrameSuper nsHTMLContainerFrame
|
||||
|
||||
#define NS_INLINE_FRAME_CONTAINS_PERCENT_AWARE_CHILD 0X00010000
|
||||
#define NS_INLINE_FRAME_CONTAINS_PERCENT_AWARE_CHILD 0x00100000
|
||||
|
||||
/**
|
||||
* Inline frame class.
|
||||
|
|
|
@ -40,13 +40,6 @@ class nsFirstLineFrame;
|
|||
#define NS_BLOCK_FRAME_ABSOLUTE_LIST_INDEX 2
|
||||
#define NS_BLOCK_FRAME_LAST_LIST_INDEX NS_BLOCK_FRAME_ABSOLUTE_LIST_INDEX
|
||||
|
||||
/**
|
||||
* Additional frame-state bits. There are more of these bits
|
||||
* defined in nsHTMLParts.h (XXX: note: this should be cleaned up)
|
||||
*/
|
||||
#define NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET 0x40000000
|
||||
#define NS_BLOCK_HAS_FIRST_LETTER_STYLE 0x20000000
|
||||
|
||||
#define nsBlockFrameSuper nsHTMLContainerFrame
|
||||
|
||||
#define NS_BLOCK_FRAME_CID \
|
||||
|
|
|
@ -41,6 +41,19 @@ class nsString;
|
|||
class nsIWebShell;
|
||||
class nsIPresShell;
|
||||
|
||||
/**
|
||||
* Additional frame-state bits used by nsBlockFrame
|
||||
* See the meanings at http://www.mozilla.org/newlayout/doc/block-and-line.html
|
||||
*/
|
||||
#define NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET 0x40000000
|
||||
#define NS_BLOCK_HAS_FIRST_LETTER_STYLE 0x20000000
|
||||
#define NS_BLOCK_SHRINK_WRAP 0x00100000
|
||||
#define NS_BLOCK_NO_AUTO_MARGINS 0x00200000
|
||||
#define NS_BLOCK_MARGIN_ROOT 0x00400000
|
||||
#define NS_BLOCK_SPACE_MGR 0x00800000
|
||||
#define NS_BLOCK_WRAP_SIZE 0x01000000
|
||||
#define NS_BLOCK_FLAGS_MASK 0xFFF00000
|
||||
|
||||
// Factory method for creating a content iterator for generated
|
||||
// content
|
||||
extern nsresult
|
||||
|
@ -254,14 +267,6 @@ NS_CreateHTMLElement(nsIHTMLContent** aResult,
|
|||
// These are variations on AreaFrame with slightly different layout
|
||||
// policies.
|
||||
|
||||
// Flags for block/area frames
|
||||
#define NS_BLOCK_SHRINK_WRAP 0x00010000
|
||||
#define NS_BLOCK_NO_AUTO_MARGINS 0x00020000
|
||||
#define NS_BLOCK_MARGIN_ROOT 0x00040000
|
||||
#define NS_BLOCK_SPACE_MGR 0x00080000
|
||||
#define NS_BLOCK_WRAP_SIZE 0x00100000
|
||||
#define NS_BLOCK_FLAGS_MASK 0x00ff0000
|
||||
|
||||
// Create a frame that supports "display: block" layout behavior
|
||||
extern nsresult NS_NewBlockFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame,
|
||||
PRUint32 aFlags = 0);
|
||||
|
|
|
@ -33,7 +33,7 @@ class nsAnonymousBlockFrame;
|
|||
|
||||
#define nsInlineFrameSuper nsHTMLContainerFrame
|
||||
|
||||
#define NS_INLINE_FRAME_CONTAINS_PERCENT_AWARE_CHILD 0X00010000
|
||||
#define NS_INLINE_FRAME_CONTAINS_PERCENT_AWARE_CHILD 0x00100000
|
||||
|
||||
/**
|
||||
* Inline frame class.
|
||||
|
|
Загрузка…
Ссылка в новой задаче