[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit cd18075d9c5735ef5aed800e596c096f540677f2
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 9 01:34:03 2003 +0000

    	Fix for 3436723, the shrink-to-fit algorithm for positioned elements did not match
    	the algorithm specified in section 10.3.7 of the CSS2.1 specification.  The min-width
    	of the element was not being taken into account like it should have been.
    
            Reviewed by mjs
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::calcAbsoluteHorizontal):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5151 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a7774dd..76fa9d1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-10-08  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3436723, the shrink-to-fit algorithm for positioned elements did not match
+	the algorithm specified in section 10.3.7 of the CSS2.1 specification.  The min-width
+	of the element was not being taken into account like it should have been.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcAbsoluteHorizontal):
+
+2003-10-08  David Hyatt  <hyatt at apple.com>
+
 	Implement min/max width and min/max height support for replaced elements.
 	
         Reviewed by ken
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a7774dd..76fa9d1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-10-08  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3436723, the shrink-to-fit algorithm for positioned elements did not match
+	the algorithm specified in section 10.3.7 of the CSS2.1 specification.  The min-width
+	of the element was not being taken into account like it should have been.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcAbsoluteHorizontal):
+
+2003-10-08  David Hyatt  <hyatt at apple.com>
+
 	Implement min/max width and min/max height support for replaced elements.
 	
         Reviewed by ken
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index c24e0fc..478a0ea 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -1155,7 +1155,9 @@ void RenderBox::calcAbsoluteHorizontal()
         //1. solve left & width.
         if (l==AUTO && w==AUTO && r!=AUTO)
         {
-            w = QMIN(m_maxWidth-pab, cw - ( r + ml + mr + pab));
+            // From section 10.3.7 of the CSS2.1 specification.
+            // "The shrink-to-fit width is: min(max(preferred minimum width, available width), preferred width)."
+            w = QMIN(QMAX(m_minWidth-pab, cw - ( r + ml + mr + pab)), m_maxWidth-pab);
             l = cw - ( r + w + ml + mr + pab);
         }
         else
@@ -1180,7 +1182,9 @@ void RenderBox::calcAbsoluteHorizontal()
         //3. solve width & right.
         if (l!=AUTO && w==AUTO && r==AUTO)
         {
-            w = QMIN(m_maxWidth-pab, cw - ( l + ml + mr + pab));
+            // From section 10.3.7 of the CSS2.1 specification.
+            // "The shrink-to-fit width is: min(max(preferred minimum width, available width), preferred width)."
+            w = QMIN(QMAX(m_minWidth-pab, cw - ( l + ml + mr + pab)), m_maxWidth-pab);
             r = cw - ( l + w + ml + mr + pab);
         }
         else

-- 
WebKit Debian packaging