[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 f5c4fe5629bad3139c0f0b849e7642b5ea8956d1
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 14 02:06:36 2003 +0000

    	Fix for 3222607.  divs that specify a fixed width should have
    	their minwidths increased to that width.  This is an issue
    	on diveintomark's list as well as a blocker for Benoit.
    
            Reviewed by gramps
    
            * khtml/rendering/render_block.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4368 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3084481..32e1a13 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2003-05-13  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3222607.  divs that specify a fixed width should have
+	their minwidths increased to that width.  This is an issue
+	on diveintomark's list as well as a blocker for Benoit.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/render_block.cpp:
+
+2003-05-13  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3256376, absolute positioned content that had to be
 	scrolled into view would not respond to events.  This is a 
 	regression caused by fixing the size of the HTML element.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3084481..32e1a13 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2003-05-13  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3222607.  divs that specify a fixed width should have
+	their minwidths increased to that width.  This is an issue
+	on diveintomark's list as well as a blocker for Benoit.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/render_block.cpp:
+
+2003-05-13  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3256376, absolute positioned content that had to be
 	scrolled into view would not respond to events.  This is a 
 	regression caused by fixing the size of the HTML element.
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index cc961ee..af20f40 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1844,8 +1844,11 @@ void RenderBlock::calcMinMaxWidth()
     if (preOrNowrap && childrenInline())
         m_minWidth = m_maxWidth;
 
-    if (style()->width().isFixed() && style()->width().value > 0)
+    if (style()->width().isFixed() && style()->width().value > 0) {
         m_maxWidth = KMAX(m_minWidth,short(style()->width().value));
+        if (!isTableCell())
+            m_minWidth = m_maxWidth;
+    }
 
     int toAdd = 0;
     toAdd = borderLeft() + borderRight() + paddingLeft() + paddingRight();

-- 
WebKit Debian packaging