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

bring condition and action in better sync when oversized nested pct based table frames are reduced in size bug 254344 r/sr=bzbarsky

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@161544 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bmlk%gmx.de 2004-08-31 18:57:06 +00:00
parent 4ea73ea2f9
commit deb5280c1e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/layout/html/table/src/nsTableOuterFrame.cpp
View File

@ -1284,9 +1284,10 @@ nsTableOuterFrame::OuterReflowChild(nsPresContext* aPresContext,
// If mComputedWidth > availWidth and availWidth >= minWidth for a nested percent table // If mComputedWidth > availWidth and availWidth >= minWidth for a nested percent table
// then adjust mComputedWidth based on availableWidth if this isn't the intial reflow // then adjust mComputedWidth based on availableWidth if this isn't the intial reflow
if ((childRS.mComputedWidth > childRS.availableWidth) && if ((NS_UNCONSTRAINEDSIZE != childRS.mComputedWidth) &&
(NS_UNCONSTRAINEDSIZE != childRS.mComputedWidth) &&
(eReflowReason_Initial != aReflowReason) && (eReflowReason_Initial != aReflowReason) &&
(childRS.mComputedWidth + childRS.mComputedBorderPadding.left +
childRS.mComputedBorderPadding.right > childRS.availableWidth) &&
IsNested(aOuterRS)) { IsNested(aOuterRS)) {
PRBool isPctWidth; PRBool isPctWidth;
IsAutoWidth(*aChildFrame, &isPctWidth); IsAutoWidth(*aChildFrame, &isPctWidth);

5
mozilla/layout/tables/nsTableOuterFrame.cpp
View File

@ -1284,9 +1284,10 @@ nsTableOuterFrame::OuterReflowChild(nsPresContext* aPresContext,
// If mComputedWidth > availWidth and availWidth >= minWidth for a nested percent table // If mComputedWidth > availWidth and availWidth >= minWidth for a nested percent table
// then adjust mComputedWidth based on availableWidth if this isn't the intial reflow // then adjust mComputedWidth based on availableWidth if this isn't the intial reflow
if ((childRS.mComputedWidth > childRS.availableWidth) && if ((NS_UNCONSTRAINEDSIZE != childRS.mComputedWidth) &&
(NS_UNCONSTRAINEDSIZE != childRS.mComputedWidth) &&
(eReflowReason_Initial != aReflowReason) && (eReflowReason_Initial != aReflowReason) &&
(childRS.mComputedWidth + childRS.mComputedBorderPadding.left +
childRS.mComputedBorderPadding.right > childRS.availableWidth) &&
IsNested(aOuterRS)) { IsNested(aOuterRS)) {
PRBool isPctWidth; PRBool isPctWidth;
IsAutoWidth(*aChildFrame, &isPctWidth); IsAutoWidth(*aChildFrame, &isPctWidth);