[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 e46eb69a268b8a93d843e7af8bce5c12c1e12896
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 27 23:43:46 2003 +0000

    	Fix for the top of directory.apple.com.  Only use the fixed
    	width on the cell (with nowrap set) if it is *larger* than
    	our current minwidth.
    
            Reviewed by darin
    
            * khtml/rendering/render_table.cpp:
            (RenderTableCell::calcMinMaxWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3951 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 33a22e4..51c8d05 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-03-27  David Hyatt  <hyatt at apple.com>
 
+	Fix for the top of directory.apple.com.  Only use the fixed
+	width on the cell (with nowrap set) if it is *larger* than
+	our current minwidth.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableCell::calcMinMaxWidth):
+
+2003-03-27  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3166374.  When a float is removed, crawl up and down the
 	tree looking for blocks that contain the float and dirty them all.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 33a22e4..51c8d05 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-03-27  David Hyatt  <hyatt at apple.com>
 
+	Fix for the top of directory.apple.com.  Only use the fixed
+	width on the cell (with nowrap set) if it is *larger* than
+	our current minwidth.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableCell::calcMinMaxWidth):
+
+2003-03-27  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3166374.  When a float is removed, crawl up and down the
 	tree looking for blocks that contain the float and dirty them all.
 	
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index bc92ff4..83c7570 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -1407,7 +1407,8 @@ void RenderTableCell::calcMinMaxWidth()
             // to make the minwidth of the cell into the fixed width.  They do this
             // even in strict mode, so do not make this a quirk.  Affected the top
             // of hiptop.com.
-            m_minWidth = style()->width().value;
+            if (m_minWidth < style()->width().value)
+                m_minWidth = style()->width().value;
     }
 }
 

-- 
WebKit Debian packaging