From 46e1f0634365d22d81972992dda9f9309ba28d3d Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu"
 <bzbarsky%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 6 Aug 2002 04:50:40 +0000
Subject: [PATCH] Remove mis-implementation of the "ua-dependent" min-width
 stuff from CSS1/2.  Bug 159059, sr=dbaron, r=hyatt

git-svn-id: svn://10.0.0.236/trunk@126437 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsBlockFrame.cpp       | 6 +-----
 mozilla/layout/html/base/src/nsBlockFrame.cpp | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index ccc8bb038ac..c19b4154514 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -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
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index ccc8bb038ac..c19b4154514 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp
@@ -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