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

Remove mis-implementation of the "ua-dependent" min-width stuff from

Browse Source 
CSS1/2.  Bug 159059, sr=dbaron, r=hyatt


git-svn-id: svn://10.0.0.236/trunk@126437 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2002-08-06 04:50:40 +00:00
parent 9537e9c0e0
commit 46e1f06343
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/layout/generic/nsBlockFrame.cpp
View File

@@ -1250,21 +1250,17 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
#ifdef NOISY_KIDXMOST
printf("%p aState.mKidXMost=%d\n", this, aState.mKidXMost);
#endif
nscoord minWidth = aState.mKidXMost + borderPadding.right;
if (!HaveAutoWidth(aReflowState)) {
// Use style defined width
aMetrics.width = borderPadding.left + aReflowState.mComputedWidth +
borderPadding.right;
// XXX quote css1 section here
if ((0 == aReflowState.mComputedWidth) && (aMetrics.width < minWidth)) {
aMetrics.width = minWidth;
}
// When style defines the width use it for the max-element-size
// because we can't shrink any smaller.
maxWidth = aMetrics.width;
}
else {
nscoord minWidth = aState.mKidXMost + borderPadding.right;
nscoord computedWidth = minWidth;
PRBool compact = PR_FALSE;
#if 0

6
mozilla/layout/html/base/src/nsBlockFrame.cpp
View File

@@ -1250,21 +1250,17 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
#ifdef NOISY_KIDXMOST
printf("%p aState.mKidXMost=%d\n", this, aState.mKidXMost);
#endif
nscoord minWidth = aState.mKidXMost + borderPadding.right;
if (!HaveAutoWidth(aReflowState)) {
// Use style defined width
aMetrics.width = borderPadding.left + aReflowState.mComputedWidth +
borderPadding.right;
// XXX quote css1 section here
if ((0 == aReflowState.mComputedWidth) && (aMetrics.width < minWidth)) {
aMetrics.width = minWidth;
}
// When style defines the width use it for the max-element-size
// because we can't shrink any smaller.
maxWidth = aMetrics.width;
}
else {
nscoord minWidth = aState.mKidXMost + borderPadding.right;
nscoord computedWidth = minWidth;
PRBool compact = PR_FALSE;
#if 0