Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved enum and replaced it with #defines

Browse Source
This commit is contained in:
troy%netscape.com 1999-01-03 00:31:46 +00:00
parent 16ca348baa
commit 99455f5082
8 changed files with 45 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/generic/nsBlockFrame.cpp
View File

@ -3483,7 +3483,7 @@ nsBaseIBFrame::ReflowFloater(nsIPresContext& aPresContext,
// CSS2 section 10.3.5: Floating non-replaced elements with an
// auto width have the computed value of zero. Therefore, don't
// bother reflowing them.
if (NS_FRAME_IS_NOT_REPLACED(aFloaterReflowState.frameType)) {
if (!NS_FRAME_IS_REPLACED(aFloaterReflowState.frameType)) {
// XXX Tables are weird and special, so check for them here...
const nsStyleDisplay* floaterDisplay;
aFloaterFrame->GetStyleData(eStyleStruct_Display,

2
layout/generic/nsBlockReflowState.cpp
View File

@ -3483,7 +3483,7 @@ nsBaseIBFrame::ReflowFloater(nsIPresContext& aPresContext,
// CSS2 section 10.3.5: Floating non-replaced elements with an
// auto width have the computed value of zero. Therefore, don't
// bother reflowing them.
if (NS_FRAME_IS_NOT_REPLACED(aFloaterReflowState.frameType)) {
if (!NS_FRAME_IS_REPLACED(aFloaterReflowState.frameType)) {
// XXX Tables are weird and special, so check for them here...
const nsStyleDisplay* floaterDisplay;
aFloaterFrame->GetStyleData(eStyleStruct_Display,

2
layout/generic/nsBlockReflowState.h
View File

@ -3483,7 +3483,7 @@ nsBaseIBFrame::ReflowFloater(nsIPresContext& aPresContext,
// CSS2 section 10.3.5: Floating non-replaced elements with an
// auto width have the computed value of zero. Therefore, don't
// bother reflowing them.
if (NS_FRAME_IS_NOT_REPLACED(aFloaterReflowState.frameType)) {
if (!NS_FRAME_IS_REPLACED(aFloaterReflowState.frameType)) {
// XXX Tables are weird and special, so check for them here...
const nsStyleDisplay* floaterDisplay;
aFloaterFrame->GetStyleData(eStyleStruct_Display,

2
layout/html/base/src/nsBlockFrame.cpp
View File

@ -3483,7 +3483,7 @@ nsBaseIBFrame::ReflowFloater(nsIPresContext& aPresContext,
// CSS2 section 10.3.5: Floating non-replaced elements with an
// auto width have the computed value of zero. Therefore, don't
// bother reflowing them.
if (NS_FRAME_IS_NOT_REPLACED(aFloaterReflowState.frameType)) {
if (!NS_FRAME_IS_REPLACED(aFloaterReflowState.frameType)) {
// XXX Tables are weird and special, so check for them here...
const nsStyleDisplay* floaterDisplay;
aFloaterFrame->GetStyleData(eStyleStruct_Display,

2
layout/html/base/src/nsBlockReflowState.cpp
View File

@ -3483,7 +3483,7 @@ nsBaseIBFrame::ReflowFloater(nsIPresContext& aPresContext,
// CSS2 section 10.3.5: Floating non-replaced elements with an
// auto width have the computed value of zero. Therefore, don't
// bother reflowing them.
if (NS_FRAME_IS_NOT_REPLACED(aFloaterReflowState.frameType)) {
if (!NS_FRAME_IS_REPLACED(aFloaterReflowState.frameType)) {
// XXX Tables are weird and special, so check for them here...
const nsStyleDisplay* floaterDisplay;
aFloaterFrame->GetStyleData(eStyleStruct_Display,

2
layout/html/base/src/nsBlockReflowState.h
View File

@ -3483,7 +3483,7 @@ nsBaseIBFrame::ReflowFloater(nsIPresContext& aPresContext,
// CSS2 section 10.3.5: Floating non-replaced elements with an
// auto width have the computed value of zero. Therefore, don't
// bother reflowing them.
if (NS_FRAME_IS_NOT_REPLACED(aFloaterReflowState.frameType)) {
if (!NS_FRAME_IS_REPLACED(aFloaterReflowState.frameType)) {
// XXX Tables are weird and special, so check for them here...
const nsStyleDisplay* floaterDisplay;
aFloaterFrame->GetStyleData(eStyleStruct_Display,

50
layout/html/base/src/nsFrameReflowState.cpp
View File

@ -109,44 +109,29 @@ nsHTMLReflowState::DetermineFrameType(nsIPresContext& aPresContext)
const nsStylePosition* pos;
frame->GetStyleData(eStyleStruct_Position, (const nsStyleStruct*&)pos);
if ((nsnull != pos) && (NS_STYLE_POSITION_ABSOLUTE == pos->mPosition)) {
if (IsReplaced(tag)) {
frameType = eCSSFrameType_AbsoluteReplaced;
}
else {
frameType = eCSSFrameType_Absolute;
}
frameType = NS_CSS_FRAME_TYPE_ABSOLUTE;
}
else if (NS_STYLE_FLOAT_NONE != display->mFloats) {
if (IsReplaced(tag)) {
frameType = eCSSFrameType_FloatingReplaced;
}
else {
frameType = eCSSFrameType_Floating;
}
frameType = NS_CSS_FRAME_TYPE_FLOATING;
}
else {
switch (display->mDisplay) {
case NS_STYLE_DISPLAY_BLOCK:
case NS_STYLE_DISPLAY_LIST_ITEM:
case NS_STYLE_DISPLAY_TABLE:
frameType = eCSSFrameType_Block;
frameType = NS_CSS_FRAME_TYPE_BLOCK;
break;
case NS_STYLE_DISPLAY_INLINE:
case NS_STYLE_DISPLAY_MARKER:
case NS_STYLE_DISPLAY_INLINE_TABLE:
if (IsReplaced(tag)) {
frameType = eCSSFrameType_InlineReplaced;
}
else {
frameType = eCSSFrameType_Inline;
}
frameType = NS_CSS_FRAME_TYPE_INLINE;
break;
case NS_STYLE_DISPLAY_RUN_IN:
case NS_STYLE_DISPLAY_COMPACT:
// XXX need to look ahead at the frame's sibling
frameType = eCSSFrameType_Block;
frameType = NS_CSS_FRAME_TYPE_BLOCK;
break;
case NS_STYLE_DISPLAY_TABLE_CELL:
@ -157,16 +142,20 @@ nsHTMLReflowState::DetermineFrameType(nsIPresContext& aPresContext)
case NS_STYLE_DISPLAY_TABLE_HEADER_GROUP:
case NS_STYLE_DISPLAY_TABLE_FOOTER_GROUP:
case NS_STYLE_DISPLAY_TABLE_ROW:
frameType = eCSSFrameType_InternalTable;
frameType = NS_CSS_FRAME_TYPE_INTERNAL_TABLE;
break;
case NS_STYLE_DISPLAY_NONE:
default:
frameType = eCSSFrameType_Unknown;
frameType = NS_CSS_FRAME_TYPE_UNKNOWN;
break;
}
NS_IF_RELEASE(tag);
}
if (IsReplaced(tag)) {
frameType = NS_FRAME_REPLACED(frameType);
}
NS_IF_RELEASE(tag);
}
// Helper function that re-calculates the left and right margin based on
@ -244,7 +233,8 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext)
// elements?
mLineHeight = CalcLineHeight(aPresContext, frame);
if (eCSSFrameType_Inline == frameType) {
// See if it's an inline non-replaced element
if (NS_CSS_FRAME_TYPE_INLINE == frameType) {
// 'width' property doesn't apply to inline non-replaced elements. The
// 'height' is given by the element's 'line-height' value
if (mLineHeight >= 0) {
@ -293,8 +283,8 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext)
}
// Calculate the computed width and height. This varies by frame type
if ((eCSSFrameType_InlineReplaced == frameType) ||
(eCSSFrameType_FloatingReplaced == frameType)) {
if ((NS_FRAME_REPLACED(NS_CSS_FRAME_TYPE_INLINE) == frameType) ||
(NS_FRAME_REPLACED(NS_CSS_FRAME_TYPE_FLOATING) == frameType)) {
// Inline replaced element and floating replaced element are basically
// treated the same
if (eStyleUnit_Auto == widthUnit) {
@ -312,7 +302,7 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext)
computedHeight);
}
} else if (eCSSFrameType_Floating == frameType) {
} else if (NS_CSS_FRAME_TYPE_FLOATING == frameType) {
// Floating non-replaced element
if (eStyleUnit_Auto == widthUnit) {
// A specified value of 'auto' becomes a computed width of 0
@ -328,7 +318,7 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext)
computedHeight);
}
} else if (eCSSFrameType_InternalTable == frameType) {
} else if (NS_CSS_FRAME_TYPE_INTERNAL_TABLE == frameType) {
// Internal table elements. The rules vary depending on the type
const nsStyleDisplay* display;
frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display);
@ -377,7 +367,7 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext)
// Compute the content width
if (eStyleUnit_Auto == widthUnit) {
if (eCSSFrameType_BlockReplaced == frameType) {
if (NS_FRAME_IS_REPLACED(frameType)) {
// Block-level replaced element in the flow. A specified value of
// 'auto' uses the element's intrinsic width
computedWidth = NS_INTRINSICSIZE;
@ -403,7 +393,7 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext)
// Compute the content height
if (eStyleUnit_Auto == heightUnit) {
if (eCSSFrameType_BlockReplaced == frameType) {
if (NS_FRAME_IS_REPLACED(frameType)) {
computedHeight = NS_INTRINSICSIZE;
} else {
computedHeight = NS_AUTOHEIGHT;

61
layout/html/base/src/nsIHTMLReflow.h
View File

@ -75,54 +75,31 @@ struct nsHTMLReflowMetrics : nsReflowMetrics {
/**
* CSS Frame type. Included as part of the reflow state.
*
* @see nsHTMLReflowState
*
* XXX This requires some more thought. Are these the correct set?
* XXX Should we treat 'replaced' as a bit flag instead of doubling the
* number of enumerators?
*/
enum nsCSSFrameType {
// unknown frame type
eCSSFrameType_Unknown,
typedef PRUint32 nsCSSFrameType;
// inline, non-replaced elements
eCSSFrameType_Inline,
#define NS_CSS_FRAME_TYPE_UNKNOWN 0
#define NS_CSS_FRAME_TYPE_INLINE 1
#define NS_CSS_FRAME_TYPE_BLOCK 2 /* block-level in normal flow */
#define NS_CSS_FRAME_TYPE_FLOATING 3
#define NS_CSS_FRAME_TYPE_ABSOLUTE 4
#define NS_CSS_FRAME_TYPE_INTERNAL_TABLE 5 /* row group frame, row frame, cell frame, ... */
// inline, replaced elements (e.g., image)
eCSSFrameType_InlineReplaced,
/**
* Bit-flag that indicates whether the element is replaced. Applies to inline,
* block-level, floating, and absolutely positioned elements
*/
#define NS_CSS_FRAME_TYPE_REPLACED 0x8000
// block-level, non-replaced elements in normal flow
eCSSFrameType_Block,
/**
* Helper macros for telling whether items are replaced
*/
// block-level, replaced elements in normal flow
eCSSFrameType_BlockReplaced,
#define NS_FRAME_IS_REPLACED(_ft) \
(NS_CSS_FRAME_TYPE_REPLACED == ((_ft) & NS_CSS_FRAME_TYPE_REPLACED))
// floating, non-replaced elements
eCSSFrameType_Floating,
// floating, replaced elements
eCSSFrameType_FloatingReplaced,
// absolutely positioned, non-replaced elements
eCSSFrameType_Absolute,
// absolutely positioned, replaced elements
eCSSFrameType_AbsoluteReplaced,
// internal table element (row group frame, row frame, table cell, ...)
eCSSFrameType_InternalTable
};
// XXX Get rid of the enum
#define NS_FRAME_IS_REPLACED(_ft) \
((eCSSFrameType_AbsoluteReplaced == (_ft)) || \
(eCSSFrameType_FloatingReplaced == (_ft)) || \
(eCSSFrameType_BlockReplaced == (_ft)) || \
(eCSSFrameType_InlineReplaced == (_ft)))
#define NS_FRAME_IS_NOT_REPLACED(_ft) \
(!NS_FRAME_IS_REPLACED(_ft))
#define NS_FRAME_REPLACED(_ft) \
(NS_CSS_FRAME_TYPE_REPLACED | (_ft))
//----------------------------------------------------------------------