mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Added 'computedMargin' to nsHTMLReflowState, which replaced the individual 

margin values (e.g., computedLeftMargin)
This commit is contained in:
troy%netscape.com 1999-01-17 05:43:02 +00:00
Родитель 178678e9e2
Коммит e805654323
7 изменённых файлов: 66 добавлений и 77 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
layout/generic/nsAreaFrame.cpp
Просмотреть файл

@ -563,8 +563,8 @@ nsAreaFrame::ReflowAbsoluteItems(nsIPresContext& aPresContext,
rect.height = desiredSize.height;
}
#else
nsRect rect(kidReflowState.computedOffsets.left + kidReflowState.computedLeftMargin,
kidReflowState.computedOffsets.top + kidReflowState.computedTopMargin,
nsRect rect(kidReflowState.computedOffsets.left + kidReflowState.computedMargin.left,
kidReflowState.computedOffsets.top + kidReflowState.computedMargin.top,
kidDesiredSize.width, kidDesiredSize.height);
#endif
absoluteFrame->SetRect(rect);

4
layout/generic/nsHTMLFrame.cpp
Просмотреть файл

@ -181,7 +181,7 @@ RootFrame::Reflow(nsIPresContext& aPresContext,
// minus and top and bottom margins
if (NS_AUTOHEIGHT == kidReflowState.computedHeight) {
kidReflowState.computedHeight = aReflowState.availableHeight -
kidReflowState.computedTopMargin - kidReflowState.computedTopMargin;
kidReflowState.computedMargin.top - kidReflowState.computedMargin.bottom;
// Computed height is for the content area so reduce it by the amount of
// space taken up by border and padding
@ -196,7 +196,7 @@ RootFrame::Reflow(nsIPresContext& aPresContext,
ReflowChild(myOnlyChild, aPresContext, desiredSize, kidReflowState,
aStatus);
nsRect rect(kidReflowState.computedLeftMargin, kidReflowState.computedTopMargin,
nsRect rect(kidReflowState.computedMargin.left, kidReflowState.computedMargin.top,
desiredSize.width, desiredSize.height);
myOnlyChild->SetRect(rect);

56
layout/generic/nsHTMLReflowState.cpp
Просмотреть файл

@ -374,8 +374,8 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
// Any remaining 'auto' values for 'left', 'right', 'margin-left', or
// 'margin-right' are replaced with 0 (their default value)
computedWidth = containingBlockWidth - computedOffsets.left -
computedLeftMargin - borderPadding.left - borderPadding.right -
computedRightMargin - computedOffsets.right;
computedMargin.left - borderPadding.left - borderPadding.right -
computedMargin.right - computedOffsets.right;
} else {
// Use the specified value for the computed width
@ -385,16 +385,16 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
if (leftIsAuto) {
// Any 'auto' on 'margin-left' or 'margin-right' are replaced with 0
// (their default value)
computedOffsets.left = containingBlockWidth - computedLeftMargin -
computedOffsets.left = containingBlockWidth - computedMargin.left -
borderPadding.left - computedWidth - borderPadding.right -
computedRightMargin - computedOffsets.right;
computedMargin.right - computedOffsets.right;
} else if (rightIsAuto) {
// Any 'auto' on 'margin-left' or 'margin-right' are replaced with 0
// (their default value)
computedOffsets.right = containingBlockWidth - computedOffsets.left -
computedLeftMargin - borderPadding.left - computedWidth -
borderPadding.right - computedRightMargin;
computedMargin.left - borderPadding.left - computedWidth -
borderPadding.right - computedMargin.right;
} else {
// All that's left to solve for are 'auto' values for 'margin-left' and
@ -411,13 +411,13 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
if (eStyleUnit_Auto == spacing->mMargin.GetRightUnit()) {
// Both 'margin-left' and 'margin-right' are 'auto', so they get
// equal values
computedLeftMargin = availMarginSpace / 2;
computedRightMargin = availMarginSpace - computedLeftMargin;
computedMargin.left = availMarginSpace / 2;
computedMargin.right = availMarginSpace - computedMargin.left;
} else {
computedLeftMargin = availMarginSpace;
computedMargin.left = availMarginSpace;
}
} else {
computedRightMargin = availMarginSpace;
computedMargin.right = availMarginSpace;
}
}
}
@ -477,8 +477,8 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
} else {
computedHeight = containingBlockHeight - computedOffsets.top -
computedTopMargin - borderPadding.top - borderPadding.bottom -
computedBottomMargin - computedOffsets.bottom;
computedMargin.top - borderPadding.top - borderPadding.bottom -
computedMargin.bottom - computedOffsets.bottom;
}
}
} else {
@ -490,8 +490,8 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
if (bottomIsAuto) {
// Any 'auto' on 'margin-top' or 'margin-bottom' are replaced with 0
computedOffsets.bottom = containingBlockHeight - computedOffsets.top -
computedTopMargin - borderPadding.top - computedHeight -
borderPadding.bottom - computedBottomMargin;
computedMargin.top - borderPadding.top - computedHeight -
borderPadding.bottom - computedMargin.bottom;
} else {
// All that's left to solve for are 'auto' values for 'margin-top' and
@ -508,13 +508,13 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
if (eStyleUnit_Auto == spacing->mMargin.GetBottomUnit()) {
// Both 'margin-top' and 'margin-bottom' are 'auto', so they get
// equal values
computedTopMargin = availMarginSpace / 2;
computedBottomMargin = availMarginSpace - computedTopMargin;
computedMargin.top = availMarginSpace / 2;
computedMargin.bottom = availMarginSpace - computedMargin.top;
} else {
computedTopMargin = availMarginSpace;
computedMargin.top = availMarginSpace;
}
} else {
computedBottomMargin = availMarginSpace;
computedMargin.bottom = availMarginSpace;
}
}
}
@ -535,7 +535,7 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext)
if (nsnull == parentReflowState) {
computedWidth = availableWidth;
computedHeight = availableHeight;
computedLeftMargin = computedRightMargin = computedTopMargin = computedBottomMargin = 0;
computedMargin.SizeTo(0, 0, 0, 0);
} else {
// Get the containing block reflow state
@ -551,15 +551,9 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext)
computedOffsets.SizeTo(0, 0, 0, 0);
}
// Compute margins from the specified margin style information
nsMargin margin;
ComputeMarginFor(frame, parentReflowState, margin);
// These become the default computed values, and may be adjusted below
computedLeftMargin = margin.left;
computedRightMargin = margin.right;
computedTopMargin = margin.top;
computedBottomMargin = margin.bottom;
// Compute margins from the specified margin style information. These
// become the default computed values, and may be adjusted below
ComputeMarginFor(frame, parentReflowState, computedMargin);
// Calculate the line height.
// XXX Do we need to do this for all elements or just inline non-replaced
@ -716,8 +710,8 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext)
// Block-level non-replaced element in the flow. 'auto' values for
// margin-left and margin-right become 0 and the sum of the areas must
// equal the width of the containing block
computedWidth = containingBlockWidth - computedLeftMargin - computedRightMargin -
borderPadding.left - borderPadding.right;
computedWidth = containingBlockWidth - computedMargin.left -
computedMargin.right - borderPadding.left - borderPadding.right;
}
}
@ -729,7 +723,7 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext)
// account the computed width, border/padding, and width of the
// containing block
CalculateLeftRightMargin(cbrs, spacing, computedWidth, borderPadding,
computedLeftMargin, computedRightMargin);
computedMargin.left, computedMargin.right);
}
// Compute the content height

4
layout/html/base/src/nsAreaFrame.cpp
Просмотреть файл

@ -563,8 +563,8 @@ nsAreaFrame::ReflowAbsoluteItems(nsIPresContext& aPresContext,
rect.height = desiredSize.height;
}
#else
nsRect rect(kidReflowState.computedOffsets.left + kidReflowState.computedLeftMargin,
kidReflowState.computedOffsets.top + kidReflowState.computedTopMargin,
nsRect rect(kidReflowState.computedOffsets.left + kidReflowState.computedMargin.left,
kidReflowState.computedOffsets.top + kidReflowState.computedMargin.top,
kidDesiredSize.width, kidDesiredSize.height);
#endif
absoluteFrame->SetRect(rect);

4
layout/html/base/src/nsHTMLFrame.cpp
Просмотреть файл

@ -181,7 +181,7 @@ RootFrame::Reflow(nsIPresContext& aPresContext,
// minus and top and bottom margins
if (NS_AUTOHEIGHT == kidReflowState.computedHeight) {
kidReflowState.computedHeight = aReflowState.availableHeight -
kidReflowState.computedTopMargin - kidReflowState.computedTopMargin;
kidReflowState.computedMargin.top - kidReflowState.computedMargin.bottom;
// Computed height is for the content area so reduce it by the amount of
// space taken up by border and padding
@ -196,7 +196,7 @@ RootFrame::Reflow(nsIPresContext& aPresContext,
ReflowChild(myOnlyChild, aPresContext, desiredSize, kidReflowState,
aStatus);
nsRect rect(kidReflowState.computedLeftMargin, kidReflowState.computedTopMargin,
nsRect rect(kidReflowState.computedMargin.left, kidReflowState.computedMargin.top,
desiredSize.width, desiredSize.height);
myOnlyChild->SetRect(rect);

56
layout/html/base/src/nsHTMLReflowState.cpp
Просмотреть файл

@ -374,8 +374,8 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
// Any remaining 'auto' values for 'left', 'right', 'margin-left', or
// 'margin-right' are replaced with 0 (their default value)
computedWidth = containingBlockWidth - computedOffsets.left -
computedLeftMargin - borderPadding.left - borderPadding.right -
computedRightMargin - computedOffsets.right;
computedMargin.left - borderPadding.left - borderPadding.right -
computedMargin.right - computedOffsets.right;
} else {
// Use the specified value for the computed width
@ -385,16 +385,16 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
if (leftIsAuto) {
// Any 'auto' on 'margin-left' or 'margin-right' are replaced with 0
// (their default value)
computedOffsets.left = containingBlockWidth - computedLeftMargin -
computedOffsets.left = containingBlockWidth - computedMargin.left -
borderPadding.left - computedWidth - borderPadding.right -
computedRightMargin - computedOffsets.right;
computedMargin.right - computedOffsets.right;
} else if (rightIsAuto) {
// Any 'auto' on 'margin-left' or 'margin-right' are replaced with 0
// (their default value)
computedOffsets.right = containingBlockWidth - computedOffsets.left -
computedLeftMargin - borderPadding.left - computedWidth -
borderPadding.right - computedRightMargin;
computedMargin.left - borderPadding.left - computedWidth -
borderPadding.right - computedMargin.right;
} else {
// All that's left to solve for are 'auto' values for 'margin-left' and
@ -411,13 +411,13 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
if (eStyleUnit_Auto == spacing->mMargin.GetRightUnit()) {
// Both 'margin-left' and 'margin-right' are 'auto', so they get
// equal values
computedLeftMargin = availMarginSpace / 2;
computedRightMargin = availMarginSpace - computedLeftMargin;
computedMargin.left = availMarginSpace / 2;
computedMargin.right = availMarginSpace - computedMargin.left;
} else {
computedLeftMargin = availMarginSpace;
computedMargin.left = availMarginSpace;
}
} else {
computedRightMargin = availMarginSpace;
computedMargin.right = availMarginSpace;
}
}
}
@ -477,8 +477,8 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
} else {
computedHeight = containingBlockHeight - computedOffsets.top -
computedTopMargin - borderPadding.top - borderPadding.bottom -
computedBottomMargin - computedOffsets.bottom;
computedMargin.top - borderPadding.top - borderPadding.bottom -
computedMargin.bottom - computedOffsets.bottom;
}
}
} else {
@ -490,8 +490,8 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
if (bottomIsAuto) {
// Any 'auto' on 'margin-top' or 'margin-bottom' are replaced with 0
computedOffsets.bottom = containingBlockHeight - computedOffsets.top -
computedTopMargin - borderPadding.top - computedHeight -
borderPadding.bottom - computedBottomMargin;
computedMargin.top - borderPadding.top - computedHeight -
borderPadding.bottom - computedMargin.bottom;
} else {
// All that's left to solve for are 'auto' values for 'margin-top' and
@ -508,13 +508,13 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
if (eStyleUnit_Auto == spacing->mMargin.GetBottomUnit()) {
// Both 'margin-top' and 'margin-bottom' are 'auto', so they get
// equal values
computedTopMargin = availMarginSpace / 2;
computedBottomMargin = availMarginSpace - computedTopMargin;
computedMargin.top = availMarginSpace / 2;
computedMargin.bottom = availMarginSpace - computedMargin.top;
} else {
computedTopMargin = availMarginSpace;
computedMargin.top = availMarginSpace;
}
} else {
computedBottomMargin = availMarginSpace;
computedMargin.bottom = availMarginSpace;
}
}
}
@ -535,7 +535,7 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext)
if (nsnull == parentReflowState) {
computedWidth = availableWidth;
computedHeight = availableHeight;
computedLeftMargin = computedRightMargin = computedTopMargin = computedBottomMargin = 0;
computedMargin.SizeTo(0, 0, 0, 0);
} else {
// Get the containing block reflow state
@ -551,15 +551,9 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext)
computedOffsets.SizeTo(0, 0, 0, 0);
}
// Compute margins from the specified margin style information
nsMargin margin;
ComputeMarginFor(frame, parentReflowState, margin);
// These become the default computed values, and may be adjusted below
computedLeftMargin = margin.left;
computedRightMargin = margin.right;
computedTopMargin = margin.top;
computedBottomMargin = margin.bottom;
// Compute margins from the specified margin style information. These
// become the default computed values, and may be adjusted below
ComputeMarginFor(frame, parentReflowState, computedMargin);
// Calculate the line height.
// XXX Do we need to do this for all elements or just inline non-replaced
@ -716,8 +710,8 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext)
// Block-level non-replaced element in the flow. 'auto' values for
// margin-left and margin-right become 0 and the sum of the areas must
// equal the width of the containing block
computedWidth = containingBlockWidth - computedLeftMargin - computedRightMargin -
borderPadding.left - borderPadding.right;
computedWidth = containingBlockWidth - computedMargin.left -
computedMargin.right - borderPadding.left - borderPadding.right;
}
}
@ -729,7 +723,7 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext)
// account the computed width, border/padding, and width of the
// containing block
CalculateLeftRightMargin(cbrs, spacing, computedWidth, borderPadding,
computedLeftMargin, computedRightMargin);
computedMargin.left, computedMargin.right);
}
// Compute the content height

15
layout/html/base/src/nsIHTMLReflow.h
Просмотреть файл

@ -127,8 +127,8 @@ struct nsHTMLReflowState : nsReflowState {
// LineLayout object (only for inline reflow; set to NULL otherwise)
nsLineLayout* lineLayout;
// Computed width and margins. The computed width specifies the frame's
// content width, and it does not apply to inline non-replaced elements
// The computed width specifies the frame's content width, and it does not
// apply to inline non-replaced elements
//
// For replaced inline frames, a value of NS_INTRINSICSIZE means you should
// use your intrinsic width as the computed width
@ -137,10 +137,9 @@ struct nsHTMLReflowState : nsReflowState {
// containing block and the margin/border/padding areas and the min/max
// width
nscoord computedWidth;
nscoord computedLeftMargin, computedRightMargin;
// Computed height and margins. The computed height specifies the frame's
// content height, and it does not apply to inline non-replaced elements
// The computed height specifies the frame's content height, and it does
// not apply to inline non-replaced elements
//
// For replaced inline frames, a value of NS_INTRINSICSIZE means you should
// use your intrinsic height as the computed height
@ -153,7 +152,9 @@ struct nsHTMLReflowState : nsReflowState {
// For replaced block-level frames, a value of NS_INTRINSICSIZE
// means you use your intrinsic height as the computed height
nscoord computedHeight;
nscoord computedTopMargin, computedBottomMargin;
// Computed margin values
nsMargin computedMargin;
// Computed values for 'left/top/right/bottom' offsets. Only applies to
// 'positioned' elements
@ -169,7 +170,7 @@ struct nsHTMLReflowState : nsReflowState {
// line-height value then this field will be "-1".
nscoord mLineHeight;
// the following data members are relevant if nsStyleText.mTextAlign == NS_STYLE_TEXT_ALIGN_CHAR
// The following data members are relevant if nsStyleText.mTextAlign == NS_STYLE_TEXT_ALIGN_CHAR
nscoord mAlignCharOffset; // distance from reference edge (as specified in nsStyleDisplay.mDirection)
// to the align character (which will be specified in nsStyleTable)
PRPackedBool mUseAlignCharOffset;// if true, the reflow honors alignCharOffset and does not