PDT+ bug 30559 - incorrect inclusion of table margin when placing row group. r=buster, a=rickg.
git-svn-id: svn://10.0.0.236/trunk@62934 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -2455,12 +2455,12 @@ NS_METHOD nsTableFrame::IncrementalReflow(nsIPresContext* aPresContext,
|
||||
}
|
||||
reflowState.availableWidth = pass1Width;
|
||||
|
||||
// get margin + border + padding
|
||||
nsMargin borderMarginPadding;
|
||||
GetTableBorder (borderMarginPadding);
|
||||
borderMarginPadding += aReflowState.mComputedMargin + aReflowState.mComputedPadding;
|
||||
// get border + padding
|
||||
nsMargin borderPadding;
|
||||
GetTableBorder (borderPadding);
|
||||
borderPadding += aReflowState.mComputedPadding;
|
||||
|
||||
InnerTableReflowState state(aPresContext, reflowState, borderMarginPadding);
|
||||
InnerTableReflowState state(aPresContext, reflowState, borderPadding);
|
||||
|
||||
// determine if this frame is the target or not
|
||||
nsIFrame *target=nsnull;
|
||||
|
||||
@@ -2455,12 +2455,12 @@ NS_METHOD nsTableFrame::IncrementalReflow(nsIPresContext* aPresContext,
|
||||
}
|
||||
reflowState.availableWidth = pass1Width;
|
||||
|
||||
// get margin + border + padding
|
||||
nsMargin borderMarginPadding;
|
||||
GetTableBorder (borderMarginPadding);
|
||||
borderMarginPadding += aReflowState.mComputedMargin + aReflowState.mComputedPadding;
|
||||
// get border + padding
|
||||
nsMargin borderPadding;
|
||||
GetTableBorder (borderPadding);
|
||||
borderPadding += aReflowState.mComputedPadding;
|
||||
|
||||
InnerTableReflowState state(aPresContext, reflowState, borderMarginPadding);
|
||||
InnerTableReflowState state(aPresContext, reflowState, borderPadding);
|
||||
|
||||
// determine if this frame is the target or not
|
||||
nsIFrame *target=nsnull;
|
||||
|
||||
Reference in New Issue
Block a user