Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 8524 - don't use -moz-bg-inset in standard mode. r=troy

Browse Source 
bug 10269 - renamed RequiresPass1Layout to IsAutoLayout and have it force a fixed layout table (not tree) to be auto layout if the table is auto width.


git-svn-id: svn://10.0.0.236/trunk@60554 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karnaze%netscape.com
2000-02-12 00:58:38 +00:00
parent 1d56b75198
commit 3348645b69
14 changed files with 89 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/layout/tables/nsTableFrame.cpp
View File

@@ -1613,7 +1613,7 @@ NS_METHOD nsTableFrame::Reflow(nsIPresContext* aPresContext,
// See if we are supposed to compute our maximum width
if (aDesiredSize.mFlags & NS_REFLOW_CALC_MAX_WIDTH) {
PRBool isAutoWidth = RequiresPass1Layout() &&
PRBool isAutoWidth = IsAutoLayout(&aReflowState) &&
(eStyleUnit_Auto == aReflowState.mStylePosition->mWidth.GetUnit());
// See if the pass1 maximum width is no longer valid because one of the
@@ -1694,7 +1694,7 @@ NS_METHOD nsTableFrame::ResizeReflowPass1(nsIPresContext* aPresContext,
// Compute the insets (sum of border and padding)
// XXX: since this is pass1 reflow and where we place the rowgroup frames is irrelevant, insets are probably a waste
if (PR_TRUE==RequiresPass1Layout())
if (IsAutoLayout(&aReflowState))
{
nsIFrame* kidFrame = aStartingFrame;
if (nsnull==kidFrame)
@@ -2886,7 +2886,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext* aPresContext,
nsresult rv = NS_OK;
nsReflowReason reason;
if (PR_FALSE==RequiresPass1Layout())
if (!IsAutoLayout(&aReflowState.reflowState))
{
reason = aReflowState.reflowState.reason;
if (eReflowReason_Incremental==reason) {
@@ -3215,7 +3215,7 @@ void nsTableFrame::BalanceColumnWidths(nsIPresContext* aPresContext,
if (nsnull == mTableLayoutStrategy) {
nsCompatibility mode;
aPresContext->GetCompatibilityMode(&mode);
if (PR_FALSE==RequiresPass1Layout())
if (!IsAutoLayout(&aReflowState))
mTableLayoutStrategy = new FixedTableLayoutStrategy(this);
else
mTableLayoutStrategy = new BasicTableLayoutStrategy(this, eCompatibility_NavQuirks == mode);
@@ -3224,7 +3224,7 @@ void nsTableFrame::BalanceColumnWidths(nsIPresContext* aPresContext,
}
// fixed-layout tables need to reinitialize the layout strategy. When there are scroll bars
// reflow gets called twice and the 2nd time has the correct space available.
else if (!RequiresPass1Layout()) {
else if (!IsAutoLayout(&aReflowState)) {
mTableLayoutStrategy->Initialize(aPresContext, aMaxElementSize, boxWidth);
}
@@ -4176,11 +4176,25 @@ void nsTableFrame::SetMaxElementSize(nsSize* aMaxElementSize)
}
PRBool nsTableFrame::RequiresPass1Layout()
PRBool nsTableFrame::IsAutoLayout(const nsHTMLReflowState* aReflowState)
{
const nsStyleTable* tableStyle;
GetStyleData(eStyleStruct_Table, (const nsStyleStruct *&)tableStyle);
return (PRBool)(NS_STYLE_TABLE_LAYOUT_FIXED!=tableStyle->mLayoutStrategy);
// a fixed table-layout table with an auto width is not considered as such
// for purposes of requiring pass1 reflow and assigning a layout strategy
if (NS_STYLE_TABLE_LAYOUT_FIXED == tableStyle->mLayoutStrategy) {
const nsStylePosition* position;
if (aReflowState) {
position = aReflowState->mStylePosition;
}
else {
GetStyleData(eStyleStruct_Position, (const nsStyleStruct *&)position);
}
if (eStyleUnit_Auto != position->mWidth.GetUnit()) {
return PR_FALSE;
}
}
return PR_TRUE;
}
#ifdef DEBUG